From 7ce9483bb65bca9658d78cf5e0feb6933dc4dab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 1 Oct 2015 14:58:16 +0200
Subject: [PATCH] Prevent gtk-mac-bundler from copying pango modules

There are no pango modules anymore since pango 1.38
---
 Makefile.am                 |  4 ---
 build/macos/linphone.bundle | 50 +++++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 007dc5dbf..0c23d65c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,10 +226,6 @@ Linphone.app:
 	MS2_PLUGINS_INSTALL_PREFIX=$(prefix) \
 	LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=$(LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX) \
 	gtk-mac-bundler $(PACKAGE_BUNDLE_FILE)
-	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
-	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
-	cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig
-	sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
 	patch -R ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch
 	rm -f ${BUNDLEDIR}/Contents/Resources/lib/libopenh264*
 
diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle
index f9309ebaa..3b533a208 100644
--- a/build/macos/linphone.bundle
+++ b/build/macos/linphone.bundle
@@ -17,6 +17,7 @@
     <prefix name="ms2plugins">${env:MS2_PLUGINS_INSTALL_PREFIX}</prefix>
     <!-- This prefix definition is necessary if some dependencies are to be taken from /usr/local/lib -->
     <prefix name="local">${env:LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX}</prefix>
+
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.
@@ -79,11 +80,7 @@
     ${prefix}/share/mime/mime.cache
   </data>
 
-  <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
-  </binary>
-
-  <!-- Copy in GTK+ theme engines. Note the use of the
+  <!-- Copy in GTK+ theme engines and print backends. Note the use of the
        "${pkg:module:variable}" macro, which evaluates to a pkg-config
        variable in the specified module. Note that any libraries that
        binaries link to are also copied in automatically.  Note also
@@ -93,30 +90,41 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
   </binary>
   <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
-  </binary>
-  <!-- Copy GIO modules, required for https access for wizard-->
-  <binary>
-     ${prefix}/lib/gio/modules/libgiognutls.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
-  <!-- Translation filenames, one for each program or library that you
+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
+  </binary>
+
+   <!--binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+  </binary-->
+
+  <!--data>
+    ${prefix}/etc/pango/
+  </data-->
+
+ <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
-  <data name="linphone">
-    ${prefix:linphone}/share/locale
-  </data>
-  <translations name="gdk-pixbuf">
-    ${prefix}/share/locale
-  </translations>
-  <translations name="glib20">
-    ${prefix}/share/locale
-  </translations>
   <translations name="gtk20">
     ${prefix}/share/locale
   </translations>
 
+  <data name="linphone">
+    ${prefix:linphone}/share/locale
+  </data>
+
+  <translations name="gdk-pixbuf">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="glib20">
+    ${prefix}/share/locale
+  </translations>
 
   <!-- Data to copy in, usually Glade/UI files, images, sounds files
        etc. The destination inside the bundle can be specified if the
@@ -140,7 +148,6 @@
     ${prefix:linphone}/share/icons
   </data>
 
-
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
   <data>
@@ -155,7 +162,6 @@
     ${project}/../../pixmaps/linphone.icns
   </data>
 
-
   <data dest="${bundle}/Contents/Resources">
     ${project}/environment.sh
   </data>