From: Tomas Chvatal Date: Tue, 26 Jul 2011 16:20:59 +0000 (+0000) Subject: Fix the gtk patch, add patch for sandbox violation during install, enforce not-stripp... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f9b797068b57cfbc905350baf4fac21fa9ea3637;p=gentoo.git Fix the gtk patch, add patch for sandbox violation during install, enforce not-stripping of solver, portage handle it himself. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index ffcf4803a865..51c03f58339f 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.54 2011/07/26 13:11:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.55 2011/07/26 16:20:59 scarabeus Exp $ + + 26 Jul 2011; Tomáš Chvátal + -files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild, + +files/libreoffice-fix-sandbox-install.patch, + files/libreoffice-as-needed-gtk.patch: + Fix the gtk patch, add patch for sandbox violation during install, enforce + not-stripping of solver, portage handle it himself. 26 Jul 2011; Tomáš Chvátal libreoffice-3.4.2.2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 4f8b4d43d4ea..a71024bfd2ad 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -12,8 +12,8 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7 -AUX libreoffice-as-needed-gtk-2.patch 8647 RMD160 38bd07e7f8e348b588b0cc518f700a453f31566d SHA1 fe52fa439d5772d3533f807c4c3db57cf83dd5e2 SHA256 14f7050ddcbc6fa5cd10953c4c649dba2f3ce089f1435f0704d71572704bdabc -AUX libreoffice-as-needed-gtk.patch 620 RMD160 a217914d283625a03a5dba76cceaf05284bfef47 SHA1 21c062a5dc31436f025a8b1b7e59459c74853e90 SHA256 d513a4874fa12c65531505265ca8248cd839fc2535c935aa0d066a81a0ec7885 +AUX libreoffice-as-needed-gtk.patch 619 RMD160 4fab1bec996f5f15da389de0cdfbb16b2323663d SHA1 541616c0376876e22411272ec48547eb9a4b6926 SHA256 f871f8d498271a58507bdbcfeefe056741166277f3ce31628d21fbfea9aa2de6 +AUX libreoffice-fix-sandbox-install.patch 1025 RMD160 6202133d984cb2d258e24f035d4754823dd61835 SHA1 601a60773f8e227a98239a3abe9bd4eea38ce0a5 SHA256 ae60ff57b901ed290da542619c5923290bc1a54f51f61a37045f180af98ed75f AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736 @@ -209,13 +209,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274 -EBUILD libreoffice-3.4.2.2.ebuild 17817 RMD160 6ef997b9f8dbecc11e7654bacc67189d21139807 SHA1 36667d0a3a9e77cca966cd4a05fc1b188c09b301 SHA256 a3db6da4a557bc915c3136ab93e317fbbd03674c871dfc56c0927e48850edc48 -MISC ChangeLog 11241 RMD160 74ad53e46131a2f5d7b9b082869434eddf1ba46a SHA1 8f50a249b46c427dcc744104294b52032764f092 SHA256 49297a264112036cea14c800f8c07a3e56ae873aab58b8907a0dbe8bc9aa1d3d +EBUILD libreoffice-3.4.2.2.ebuild 17848 RMD160 cc231a858683274f7d561327605c82cfbedeadc0 SHA1 b815df069d670c65db0a499242cea468b2b1973a SHA256 0ed6ab4dcce2abc6943ce4272ce1ed70aeee38332fda4f2199e642c8de825334 +MISC ChangeLog 11589 RMD160 2a3aba7f6b07eb6c9d5b8b6ee6dbac360bf82f50 SHA1 6d7a12edd5d14457c3b2834a97fa4369c2aa830d SHA256 d388e07bb6b9983c3d597af869f72edef97a30d1a3b902562258ad5e40109c6a MISC metadata.xml 968 RMD160 4c276f754c1e2f9e2ca31d8afc848c7104405071 SHA1 ffd8cf3e1260eceeca576d417138f2d8584bf0fd SHA256 8dc930d20711f541b049eefa6e2b77fe5904c26ca4a08ea40553acb787c94908 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4uvNUACgkQHB6c3gNBRYcuEwCgqBc9uQtKeQx4HrH32a7JNxzo -JnkAn25xN9MDdXcgfnivmtKSXDDVR4uo -=WwNG +iEYEARECAAYFAk4u6TEACgkQHB6c3gNBRYdarwCgu6qUlmx7N5Ocj8s8afnp1KNL +zwUAn3YqoloTDeVBnjqDEMiVbgmmCZ35 +=Ep9u -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch deleted file mode 100644 index 31df1e473e42..000000000000 --- a/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch +++ /dev/null @@ -1,66 +0,0 @@ - - - -libreoffice/libs-core - Libraries shared amon applications - - - - - - -
- - - - -
-summaryrefslogtreecommitdiff
- - - -
-
-
- - - - -
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-26 12:52:45 (GMT)
committer Bjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-26 12:53:55 (GMT)
commit24e5e18ccd413797f143b27945a226597a1c42b1 (patch)
tree8938832137d91ba264c3d04b1a7efb10065bc2bf
parent2829346208ebf2c6e0337e1b4d95d13716410823 (diff)
downloadlibs-core-24e5e18ccd413797f143b27945a226597a1c42b1.zip
libs-core-24e5e18ccd413797f143b27945a226597a1c42b1.tar.gz
libs-core-24e5e18ccd413797f143b27945a226597a1c42b1.tar.bz2
-
use gtk external in qstartmaster
Diffstat
-
-rwxr-xr-xsfx2/Library_qstart.mk14
1 files changed, 4 insertions, 10 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 13842f7..8819829 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
-I$(SRCDIR)/sfx2/inc/sfx2 \
-I$(SRCDIR)/sfx2/inc/pch \
-I$(OUTDIR)/inc \
- $(filter -I%,$(GTK_CFLAGS)) \
))
$(eval $(call gb_Library_add_api,qstart_gtk,\
@@ -53,14 +52,6 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\
))
endif
-$(eval $(call gb_Library_add_cflags,qstart_gtk,\
- $(filter-out -I%,$(GTK_CFLAGS)) \
-))
-
-$(eval $(call gb_Library_add_libs,qstart_gtk,\
- $(GTK_LIBS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
comphelper \
cppu \
@@ -81,7 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
sfx \
))
-$(eval $(call gb_Library_use_external,qstart_gtk,libxml2))
+$(eval $(call gb_Library_use_externals,qstart_gtk,\
+ gtk \
+ libxml2 \
+))
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
sfx2/source/appl/shutdowniconunx \
-
generated by cgit v0.8.3.1 at 2011-07-26 12:56:40 (GMT)
-
- - diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch index 9785dc2d3f2c..a45eb20f5b42 100644 --- a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch +++ b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch @@ -1,27 +1,19 @@ -From 7d59c9f0e6768418d1ee791b6a5bec6d7b15a4d1 Mon Sep 17 00:00:00 2001 -From: Bjoern Michaelsen -Date: Tue, 26 Jul 2011 12:51:35 +0000 -Subject: add gtk external - ---- -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index ee65d9e..f30526c 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -437,5 +437,14 @@ endef +diff -urN libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk +--- libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk 2011-07-26 14:28:50.000000000 +0200 ++++ libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk 2011-07-26 14:31:09.000000000 +0200 +@@ -58,7 +58,6 @@ - endif # SYSTEM_OPENSSL + $(eval $(call gb_Library_set_ldflags,qstart_gtk,\ + $$(LDFLAGS) \ +- $(GTK_LIBS) \ + )) -+define gb_LinkTarget__use_gtk -+$(call gb_LinkTarget_set_include,$(1),\ -+ $$(INCLUDE) \ -+ $(GTK_CFLAGS) \ -+) -+ -+$(call gb_LinkTarget_add_libs,$(1),$(GTK_LIBS)) -+ -+endef + $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ +@@ -80,6 +79,7 @@ + vcl \ + xml2 \ + sfx \ ++ $(GTK_LIBS) \ + )) - # vim: set noet sw=4 ts=4: --- -cgit v0.8.3-6-g21f6 + $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ \ No newline at end of file diff --git a/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch new file mode 100644 index 000000000000..fca10c6bb521 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch @@ -0,0 +1,19 @@ +diff -urN libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integration libreoffice-bootstrap-3.4.2.2/bin/distro-install-desktop-integration +--- libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integration 2011-07-26 16:52:39.000000000 +0200 ++++ libreoffice-bootstrap-3.4.2.2/bin/distro-install-desktop-integration 2011-07-26 16:55:22.000000000 +0200 +@@ -78,7 +78,7 @@ + } + + # install desktop integration from plain packages +-sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` ++sysui_temp=`mktemp -d $DESTDIR/tmp/distro-pack-desktop-integration-XXXXXX` + cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" + cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" + builddir=`pwd` +@@ -178,4 +178,4 @@ + chmod 755 "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" + test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand + +-exit 0 +\ Chybí znak konce řádku na konci souboru ++exit 0 diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index 613fe75ad57a..b258ef60480c 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.14 2011/07/26 13:11:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.15 2011/07/26 16:20:59 scarabeus Exp $ EAPI=3 @@ -218,7 +218,7 @@ PATCHES=( "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch" "${FILESDIR}/${PN}-solenv-build-crash.patch" "${FILESDIR}/${PN}-as-needed-gtk.patch" - "${FILESDIR}/${PN}-as-needed-gtk-2.patch" + "${FILESDIR}/${PN}-fix-sandbox-install.patch" ) # Uncoment me when updating to eapi4 @@ -440,6 +440,7 @@ src_configure() { --disable-pch \ --disable-rpath \ --disable-static-gtk \ + --disable-strip-solver \ --disable-zenity \ --with-alloc=system \ --with-build-version="Gentoo official package" \