[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-as-needed-gtk.patch libreoffice-fix-sandbox-install.patch libreoffice-as-needed-gtk-2.patch

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-as-needed-gtk.patch libreoffice-fix-sandbox-install.patch libreoffice-as-needed-gtk-2.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/07/26 16:20:59

  Modified:             libreoffice-as-needed-gtk.patch
  Added:                libreoffice-fix-sandbox-install.patch
  Removed:              libreoffice-as-needed-gtk-2.patch
  Log:
  Fix the gtk patch, add patch for sandbox violation during install, enforce not-stripping of solver, portage handle it himself.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-office/libreoffice/files/libreoffice-as-needed-gtk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?r1=1.1&r2=1.2

Index: libreoffice-as-needed-gtk.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-as-needed-gtk.patch	26 Jul 2011 13:05:05 -0000	1.1
+++ libreoffice-as-needed-gtk.patch	26 Jul 2011 16:20:59 -0000	1.2
@@ -1,27 +1,19 @@
-From 7d59c9f0e6768418d1ee791b6a5bec6d7b15a4d1 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-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



1.1                  app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?rev=1.1&view=markup
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

Index: libreoffice-fix-sandbox-install.patch
===================================================================
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