[Python-modules-commits] r11844 - in packages/gamera/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, February 21, 2010 @ 22:07:28
  Author: jwilk
Revision: 11844

Link _png_support.so with libpng on all Unix architectures (closes:
#570809). (png-support-libpng.diff)

Added:
  packages/gamera/trunk/debian/patches/png-support-libpng.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-02-21 13:46:21 UTC (rev 11843)
+++ packages/gamera/trunk/debian/changelog	2010-02-21 22:07:28 UTC (rev 11844)
@@ -1,3 +1,10 @@
+gamera (3.2.4-2) UNRELEASED; urgency=low
+
+  * Link _png_support.so with libpng on all Unix architectures (closes:
+    #570809). (png-support-libpng.diff)
+
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 21 Feb 2010 23:06:50 +0100
+
 gamera (3.2.4-1) unstable; urgency=low
 
   * New upstream release (closes: #569820).

Added: packages/gamera/trunk/debian/patches/png-support-libpng.diff
===================================================================
--- packages/gamera/trunk/debian/patches/png-support-libpng.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/png-support-libpng.diff	2010-02-21 22:07:28 UTC (rev 11844)
@@ -0,0 +1,25 @@
+Description: Link _png_support.so with libpng on all Unix architectures.
+Author: Jakub Wilk <jwilk at debian.org>
+
+--- gamera-3.2.4.orig/gamera/plugins/png_support.py
++++ gamera-3.2.4/gamera/plugins/png_support.py
+@@ -82,9 +82,7 @@ class PngSupportModule(PluginModule):
+     cpp_headers = ["png_support.hpp"]
+     internal_png_dir = "src/libpng-1.2.5/"
+     internal_zlib_dir = "src/zlib-1.2.1/"
+-    if sys.platform == 'linux2':
+-        extra_libraries = ["png"]
+-    elif sys.platform == 'darwin':
++    if sys.platform == 'darwin':
+         found_png = None
+         for p in ["/sw", "/usr", "/usr/local"]:
+             if os.path.exists(os.path.join(p, "include/png.h")):
+@@ -115,6 +113,8 @@ class PngSupportModule(PluginModule):
+                              'uncompr.c','zutil.c']])
+         cpp_include_dirs = [internal_png_dir, "include/zlib-1.2.1"]
+ #        extra_libraries = ["z"]
++    else:
++        extra_libraries = ["png"]
+     functions = [save_PNG, PNG_info, load_PNG]
+     author = "Michael Droettboom and Albert Bzreckzo"
+     url = "http://gamera.sourceforge.net/"

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2010-02-21 13:46:21 UTC (rev 11843)
+++ packages/gamera/trunk/debian/patches/series	2010-02-21 22:07:28 UTC (rev 11844)
@@ -1,4 +1,5 @@
 tiff-support-64bit.diff
+png-support-libpng.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff