SF.net SVN: gar:[22954] csw/mgar/pkg

[cgrzemba at users.sourceforge.net]

Revision: 22954
          http://sourceforge.net/p/gar/code/22954
Author:   cgrzemba
Date:     2014-02-07 07:18:40 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
xsane/trunk: initail commit

Added Paths:
-----------
    csw/mgar/pkg/xsane/
    csw/mgar/pkg/xsane/Makefile
    csw/mgar/pkg/xsane/branches/
    csw/mgar/pkg/xsane/tags/
    csw/mgar/pkg/xsane/trunk/
    csw/mgar/pkg/xsane/trunk/Makefile
    csw/mgar/pkg/xsane/trunk/checksums
    csw/mgar/pkg/xsane/trunk/files/
    csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch

Added: csw/mgar/pkg/xsane/Makefile
===================================================================
--- csw/mgar/pkg/xsane/Makefile	                        (rev 0)
+++ csw/mgar/pkg/xsane/Makefile	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/xsane/trunk
===================================================================
--- csw/mgar/pkg/xsane/trunk	2014-02-06 13:05:01 UTC (rev 22953)
+++ csw/mgar/pkg/xsane/trunk	2014-02-07 07:18:40 UTC (rev 22954)

Property changes on: csw/mgar/pkg/xsane/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/xsane/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xsane/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/Makefile	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,40 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = xsane
+VERSION = 0.999
+GARTYPE = v2
+# CATEGORIES = category
+
+DESCRIPTION = XSane graphical scanning frontend
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://www.xsane.org/download/
+DISTFILES  = $(DISTNAME).tar.gz
+
+# on libpng15 API changed
+PATCHFILES = 0001-libpng15.patch
+
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibz1
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibsane1
+CHECKPKG_OVERRIDES_CSWxsane += file-with-bad-content|/usr/share|root/opt/csw/bin/xsane
+
+GARCOMPILER = GCC4
+
+EXTRA_LINKER_FLAGS  = -lsocket -lnsl
+SKIPTEST = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/xsane/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/xsane/trunk/checksums
===================================================================
--- csw/mgar/pkg/xsane/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/checksums	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1 @@
+9927f21e1ab6ba96315e7f0e30746deb  xsane-0.999.tar.gz

Added: csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch
===================================================================
--- csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,20 @@
+--- a/src/xsane-save.c
++++ b/src/xsane-save.c
+@@ -4910,7 +4910,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info *
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
+@@ -5100,7 +5100,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.