| 1 |
scarabeus 11/07/26 16:20:59 |
| 2 |
|
| 3 |
Modified: libreoffice-as-needed-gtk.patch |
| 4 |
Added: libreoffice-fix-sandbox-install.patch |
| 5 |
Removed: libreoffice-as-needed-gtk-2.patch |
| 6 |
Log: |
| 7 |
Fix the gtk patch, add patch for sandbox violation during install, enforce not-stripping of solver, portage handle it himself. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 app-office/libreoffice/files/libreoffice-as-needed-gtk.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: libreoffice-as-needed-gtk.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- libreoffice-as-needed-gtk.patch 26 Jul 2011 13:05:05 -0000 1.1 |
| 25 |
+++ libreoffice-as-needed-gtk.patch 26 Jul 2011 16:20:59 -0000 1.2 |
| 26 |
@@ -1,27 +1,19 @@ |
| 27 |
-From 7d59c9f0e6768418d1ee791b6a5bec6d7b15a4d1 Mon Sep 17 00:00:00 2001 |
| 28 |
-From: Bjoern Michaelsen <bjoern.michaelsen@×××××××××.com> |
| 29 |
-Date: Tue, 26 Jul 2011 12:51:35 +0000 |
| 30 |
-Subject: add gtk external |
| 31 |
- |
| 32 |
---- |
| 33 |
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk |
| 34 |
-index ee65d9e..f30526c 100644 |
| 35 |
---- a/RepositoryExternal.mk |
| 36 |
-+++ b/RepositoryExternal.mk |
| 37 |
-@@ -437,5 +437,14 @@ endef |
| 38 |
+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 |
| 39 |
+--- libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk 2011-07-26 14:28:50.000000000 +0200 |
| 40 |
++++ libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk 2011-07-26 14:31:09.000000000 +0200 |
| 41 |
+@@ -58,7 +58,6 @@ |
| 42 |
|
| 43 |
- endif # SYSTEM_OPENSSL |
| 44 |
+ $(eval $(call gb_Library_set_ldflags,qstart_gtk,\ |
| 45 |
+ $$(LDFLAGS) \ |
| 46 |
+- $(GTK_LIBS) \ |
| 47 |
+ )) |
| 48 |
|
| 49 |
-+define gb_LinkTarget__use_gtk |
| 50 |
-+$(call gb_LinkTarget_set_include,$(1),\ |
| 51 |
-+ $$(INCLUDE) \ |
| 52 |
-+ $(GTK_CFLAGS) \ |
| 53 |
-+) |
| 54 |
-+ |
| 55 |
-+$(call gb_LinkTarget_add_libs,$(1),$(GTK_LIBS)) |
| 56 |
-+ |
| 57 |
-+endef |
| 58 |
+ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ |
| 59 |
+@@ -80,6 +79,7 @@ |
| 60 |
+ vcl \ |
| 61 |
+ xml2 \ |
| 62 |
+ sfx \ |
| 63 |
++ $(GTK_LIBS) \ |
| 64 |
+ )) |
| 65 |
|
| 66 |
- # vim: set noet sw=4 ts=4: |
| 67 |
--- |
| 68 |
-cgit v0.8.3-6-g21f6 |
| 69 |
+ $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ |
| 70 |
\ No newline at end of file |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1 app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?rev=1.1&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?rev=1.1&content-type=text/plain |
| 78 |
|
| 79 |
Index: libreoffice-fix-sandbox-install.patch |
| 80 |
=================================================================== |
| 81 |
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 |
| 82 |
--- libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integration 2011-07-26 16:52:39.000000000 +0200 |
| 83 |
+++ libreoffice-bootstrap-3.4.2.2/bin/distro-install-desktop-integration 2011-07-26 16:55:22.000000000 +0200 |
| 84 |
@@ -78,7 +78,7 @@ |
| 85 |
} |
| 86 |
|
| 87 |
# install desktop integration from plain packages |
| 88 |
-sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` |
| 89 |
+sysui_temp=`mktemp -d $DESTDIR/tmp/distro-pack-desktop-integration-XXXXXX` |
| 90 |
cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" |
| 91 |
cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" |
| 92 |
builddir=`pwd` |
| 93 |
@@ -178,4 +178,4 @@ |
| 94 |
chmod 755 "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" |
| 95 |
test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand |
| 96 |
|
| 97 |
-exit 0 |
| 98 |
\ Chybí znak konce řádku na konci souboru |
| 99 |
+exit 0 |
Archives