mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
e49d52658a
* upsteam 2/4 patches * more work on kde5 file picker by Katarina * fix transparent focus button text
65 lines
2.7 KiB
Plaintext
65 lines
2.7 KiB
Plaintext
From bfe48ff76c7e05ada61e7f1e0b03ebaeb715a97c Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Fri, 1 Jun 2018 15:23:47 +0300
|
|
Subject: Fix make distro-pack-install on Haiku
|
|
|
|
|
|
diff --git a/Repository.mk b/Repository.mk
|
|
index 2a66608..e26f8e1 100644
|
|
--- a/Repository.mk
|
|
+++ b/Repository.mk
|
|
@@ -142,7 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
|
|
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
|
|
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
|
|
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
|
|
- $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
|
|
+ $(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
|
|
soffice_bin \
|
|
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
|
|
$(if $(filter WNT,$(OS)), \
|
|
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
|
|
- $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
|
+ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
|
$(if $(ENABLE_MACOSX_SANDBOX),, \
|
|
regmerge \
|
|
regview \
|
|
@@ -1022,7 +1022,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
|
|
desktop_branding \
|
|
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
|
|
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
|
|
- $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
|
+ $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
|
$(if $(ENABLE_HEADLESS),, \
|
|
desktop_soffice_sh \
|
|
) \
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From 7b73ecd7f14b66474c9ec18b6beb94250530d3f4 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Mon, 4 Jun 2018 11:55:30 +0300
|
|
Subject: Fix profile dir location on Haiku
|
|
|
|
|
|
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
|
|
index 315e5c8..5aff39b 100644
|
|
--- a/instsetoo_native/CustomTarget_setup.mk
|
|
+++ b/instsetoo_native/CustomTarget_setup.mk
|
|
@@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
|
|
&& echo 'InstallMode=<installmode>' \
|
|
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
|
|
$(if $(ENABLE_RELEASE_BUILD),\
|
|
- && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
|
+ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
|
&& echo 'UserInstallation=$$ORIGIN/..') \
|
|
) > $@
|
|
|
|
--
|
|
2.16.4
|
|
|
|
|