[csw-devel] SF.net SVN: gar:[19298] csw/mgar/pkg/gimp/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Thu Sep 27 10:43:36 CEST 2012
Revision: 19298
http://gar.svn.sourceforge.net/gar/?rev=19298&view=rev
Author: cgrzemba
Date: 2012-09-27 08:43:36 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
gimp/trunk: bumb version 2.8.2
Modified Paths:
--------------
csw/mgar/pkg/gimp/trunk/Makefile
csw/mgar/pkg/gimp/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gimp/trunk/files/
csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch
csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch
csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch
csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch
csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch
Modified: csw/mgar/pkg/gimp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 08:06:29 UTC (rev 19297)
+++ csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 08:43:36 UTC (rev 19298)
@@ -1,5 +1,5 @@
NAME = gimp
-VERSION = 2.6.11
+VERSION = 2.8.2
GARTYPE = v2
CATEGORIES = gnome
@@ -20,52 +20,61 @@
VENDOR_URL = http://www.gimp.org/
+PATCHFILES += 0001-studio-compiler-flags-configure.ac.patch
+PATCHFILES += 0002-skip-backtrace-base-utils.c.patch
+PATCHFILES += 0003-no-gcc-flags-Makefile.am.patch
+PATCHFILES += 0004-no-gcc-flags-Makefile.am.patch
+PATCHFILES += 0005-usr-local-sanity.c.patch
+
+EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/lib/gimp/2.0/python/.*py[co]
+
PACKAGES += CSWgimp
SPKG_DESC_CSWgimp = The GNU Image Manipulation Program
# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmflite0-2-7
-RUNTIME_DEP_PKGS_CSWgimp += CSWgtk2
+# RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmflite0-2-7
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpconfig2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpbase2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmath2-0-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibexif12
+# RUNTIME_DEP_PKGS_CSWgimp += CSWlibexif12
RUNTIME_DEP_PKGS_CSWgimp += CSWlibjpeg7
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpcolor2-0-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibgegl0-1-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmf0-2-7
+# RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmf0-2-7
RUNTIME_DEP_PKGS_CSWgimp += CSWxpm
RUNTIME_DEP_PKGS_CSWgimp += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus1-3
RUNTIME_DEP_PKGS_CSWgimp += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus-glib1-2
RUNTIME_DEP_PKGS_CSWgimp += CSWfconfig
RUNTIME_DEP_PKGS_CSWgimp += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibz1
RUNTIME_DEP_PKGS_CSWgimp += CSWpython
RUNTIME_DEP_PKGS_CSWgimp += CSWlibbabl0-1-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibatk1-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWpango
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpui2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmodule2-0-0
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpwidgets2-0-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWliblcms1
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibrsvg2-2
+# RUNTIME_DEP_PKGS_CSWgimp += CSWliblcms1
RUNTIME_DEP_PKGS_CSWgimp += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgimp += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWgimp += CSWftype2
RUNTIME_DEP_PKGS_CSWgimp += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWgimp += CSWaalib
+# RUNTIME_DEP_PKGS_CSWgimp += CSWaalib
RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpthumb2-0-0
-OBSOLETED_BY_CSWgimp += CSWgimpminimal
-OBSOLETED_BY_CSWgimp += CSWgimpi18n
-OBSOLETED_BY_CSWgimp += CSWgimplibsdoc
+RUNTIME_DEP_PKGS_CSWgimp += CSWjasper
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgimp += CSWgs
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibgegl0-2-0
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimp2-0-0
+RUNTIME_DEP_PKGS_CSWgimp += CSWlibxpm4
+# OBSOLETED_BY_CSWgimp += CSWgimpminimal
+# OBSOLETED_BY_CSWgimp += CSWgimpi18n
+# OBSOLETED_BY_CSWgimp += CSWgimplibsdoc
+
PACKAGES += CSWlibgimp-dev
SPKG_DESC_CSWlibgimp-dev = Development files for libgimp*-2.0.so.0 libraries
PKGFILES_CSWlibgimp-dev += $(PKGFILES_DEVEL)
@@ -78,34 +87,41 @@
RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpwidgets2-0-0
RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWgimp
+RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimp2-0-0
+OBSOLETED_BY_CSWgimp-dev += CSWgimplibs
PACKAGES += CSWlibgimp2-0-0
SPKG_DESC_CSWlibgimp2-0-0 = GIMP library, libgimp-2.0.so.0
PKGFILES_CSWlibgimp2-0-0 += $(call pkgfiles_lib,libgimp-2.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpconfig2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpcolor2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpbase2-0-0
OBSOLETED_BY_CSWlibgimp2-0-0 += CSWgimplibs
PACKAGES += CSWlibgimpbase2-0-0
SPKG_DESC_CSWlibgimpbase2-0-0 = GIMP library, libgimpbase-2.0.so.0
PKGFILES_CSWlibgimpbase2-0-0 += $(call pkgfiles_lib,libgimpbase-2.0.so.0)
-OBSOLETED_BY_CSWlibgimpbase2-0-0 += CSWgimplibs
RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibglib2-0-0
+OBSOLETED_BY_CSWlibgimpbase2-0-0 += CSWgimplibs
PACKAGES += CSWlibgimpcolor2-0-0
SPKG_DESC_CSWlibgimpcolor2-0-0 = GIMP library, libgimpcolor-2.0.so.0
PKGFILES_CSWlibgimpcolor2-0-0 += $(call pkgfiles_lib,libgimpcolor-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibcairo2
OBSOLETED_BY_CSWlibgimpcolor2-0-0 += CSWgimplibs
PACKAGES += CSWlibgimpconfig2-0-0
SPKG_DESC_CSWlibgimpconfig2-0-0 = GIMP library, libgimpconfig-2.0.so.0
PKGFILES_CSWlibgimpconfig2-0-0 += $(call pkgfiles_lib,libgimpconfig-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgimpbase2-0-0
@@ -117,8 +133,6 @@
PACKAGES += CSWlibgimpmath2-0-0
SPKG_DESC_CSWlibgimpmath2-0-0 = GIMP library, libgimpmath-2.0.so.0
PKGFILES_CSWlibgimpmath2-0-0 += $(call pkgfiles_lib,libgimpmath-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibglib2-0-0
OBSOLETED_BY_CSWlibgimpmath2-0-0 += CSWgimplibs
@@ -126,7 +140,6 @@
PACKAGES += CSWlibgimpmodule2-0-0
SPKG_DESC_CSWlibgimpmodule2-0-0 = GIMP library, libgimpmodule-2.0.so.0
PKGFILES_CSWlibgimpmodule2-0-0 += $(call pkgfiles_lib,libgimpmodule-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgobject2-0-0
@@ -137,65 +150,53 @@
PACKAGES += CSWlibgimpthumb2-0-0
SPKG_DESC_CSWlibgimpthumb2-0-0 = GIMP library, libgimpthumb-2.0.so.0
PKGFILES_CSWlibgimpthumb2-0-0 += $(call pkgfiles_lib,libgimpthumb-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWgtk2
RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibglib2-0-0
-OBSOLETED_BY_CSWlibgimpthumb2-0-0 += CSWgimplibs
+RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgdk-pixbuf2-0-0
+# OBSOLETED_BY_CSWlibgimpthumb2-0-0 += CSWgimplibs
PACKAGES += CSWlibgimpui2-0-0
SPKG_DESC_CSWlibgimpui2-0-0 = GIMP library, libgimpui-2.0.so.0
PKGFILES_CSWlibgimpui2-0-0 += $(call pkgfiles_lib,libgimpui-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpcolor2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpbase2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWftype2
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgtk2
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgimp
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpwidgets2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimp2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibintl8
OBSOLETED_BY_CSWlibgimpui2-0-0 += CSWgimplibs
PACKAGES += CSWlibgimpwidgets2-0-0
SPKG_DESC_CSWlibgimpwidgets2-0-0 = GIMP library, libgimpwidgets-2.0.so.0
PKGFILES_CSWlibgimpwidgets2-0-0 += $(call pkgfiles_lib,libgimpwidgets-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpcolor2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpbase2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWgtk2
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpconfig2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgdk-x11-2-0-0
OBSOLETED_BY_CSWlibgimpwidgets2-0-0 += CSWgimplibs
BUILD64 = 1
ISAEXEC = 1
CONFIGURE_ARGS += $(DIRPATHS)
-
# No 64 bit Python yet
CONFIGURE_ARGS-64 += --disable-python
-
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+CONFIGURE_ARGS += --enable-mmx=no
+CONFIGURE_ARGS += --enable-sse=no
CONFFILES += controllerrc
CONFFILES += gimprc
@@ -213,5 +214,13 @@
include gar/category.mk
+pre-configure-modulated:
+ cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+ cd $(WORKSRC) && aclocal
+ cd $(WORKSRC) && autoconf --force
+ cd $(WORKSRC) && automake -a -c -f
+ cd $(WORKSRC) && autoheader
+ $(MAKECOOKIE)
+
# For /opt/csw/gnu/xgettext
PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/gimp/trunk/checksums
===================================================================
--- csw/mgar/pkg/gimp/trunk/checksums 2012-09-27 08:06:29 UTC (rev 19297)
+++ csw/mgar/pkg/gimp/trunk/checksums 2012-09-27 08:43:36 UTC (rev 19298)
@@ -1 +1 @@
-bb2939fe13e54fc7255cef5d097bb5dd gimp-2.6.11.tar.bz2
+b542138820ca3a41cbd63fc331907955 gimp-2.8.2.tar.bz2
Added: csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch
===================================================================
--- csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch (rev 0)
+++ csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch 2012-09-27 08:43:36 UTC (rev 19298)
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -361,19 +361,19 @@ CFLAGS="$CFLAGS $extra_warnings"
+ GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-non-literal')
+ CFLAGS="$CFLAGS $extra_warnings"
+
+-GIMP_DETECT_CFLAGS(extra_warnings, '-fno-common')
+-CFLAGS="$CFLAGS $extra_warnings"
++# GIMP_DETECT_CFLAGS(extra_warnings, '-fno-common')
++# CFLAGS="$CFLAGS $extra_warnings"
+
+-GIMP_DETECT_CFLAGS(extra_warnings, '-fdiagnostics-show-option')
+-CFLAGS="$CFLAGS $extra_warnings"
++# GIMP_DETECT_CFLAGS(extra_warnings, '-fdiagnostics-show-option')
++# CFLAGS="$CFLAGS $extra_warnings"
+
+
+ # Extra optimization flags for super performance
+-GIMP_DETECT_CFLAGS(extra_warnings, '--omg-optimized')
+-CFLAGS="$CFLAGS $extra_warnings"
+-
+-GIMP_DETECT_CFLAGS(extra_warnings, '--disable-instructions')
+-CFLAGS="$CFLAGS $extra_warnings"
++# GIMP_DETECT_CFLAGS(extra_warnings, '--omg-optimized')
++# CFLAGS="$CFLAGS $extra_warnings"
++#
++# GIMP_DETECT_CFLAGS(extra_warnings, '--disable-instructions')
++# CFLAGS="$CFLAGS $extra_warnings"
+
+
+ # Ensure MSVC-compatible struct packing convention is used when
+@@ -1801,8 +1801,6 @@ if test "x$enable_python" != xno; then
+ AC_SUBST(PYGTK_DEFSDIR)
+ AC_MSG_RESULT($PYGTK_DEFSDIR)
+
+- GIMP_DETECT_CFLAGS(PYGIMP_EXTRA_CFLAGS, '-fno-strict-aliasing')
+- AC_SUBST(PYGIMP_EXTRA_CFLAGS)
+ fi
+ AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno)
+
Added: csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch
===================================================================
--- csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch (rev 0)
+++ csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch 2012-09-27 08:43:36 UTC (rev 19298)
@@ -0,0 +1,20 @@
+--- a/app/base/base-utils.c
++++ b/app/base/base-utils.c
+@@ -29,7 +29,7 @@
+ #include <process.h>
+ #endif
+
+-#ifdef G_OS_UNIX
++#ifdef XXX_G_OS_UNIX
+ /* For get_backtrace() */
+ #include <stdlib.h>
+ #include <string.h>
+@@ -112,7 +112,7 @@ get_physical_memory_size (void)
+ char *
+ get_backtrace (void)
+ {
+-#ifdef G_OS_UNIX
++#ifdef XXX_G_OS_UNIX
+ void *functions[MAX_FUNC];
+ char **function_names;
+ int n_functions;
Added: csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch (rev 0)
+++ csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch 2012-09-27 08:43:36 UTC (rev 19298)
@@ -0,0 +1,10 @@
+--- a/plug-ins/file-fits/Makefile.am
++++ b/plug-ins/file-fits/Makefile.am
+@@ -18,7 +18,6 @@ file_fits_RC = file-fits.rc.o
+ endif
+
+ AM_LDFLAGS = $(mwindows)
+-AM_CFLAGS = -fno-strict-aliasing
+
+ libexecdir = $(gimpplugindir)/plug-ins
+
Added: csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch (rev 0)
+++ csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch 2012-09-27 08:43:36 UTC (rev 19298)
@@ -0,0 +1,10 @@
+--- a/plug-ins/common/Makefile.am
++++ b/plug-ins/common/Makefile.am
+@@ -1071,7 +1071,6 @@ file_desktop_link_LDADD = \
+ $(INTLLIBS) \
+ $(file_desktop_link_RC)
+
+-file_dicom_CFLAGS = -fno-strict-aliasing
+
+ file_dicom_SOURCES = \
+ file-dicom.c
Added: csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch
===================================================================
--- csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch (rev 0)
+++ csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch 2012-09-27 08:43:36 UTC (rev 19298)
@@ -0,0 +1,11 @@
+--- a/app/sanity.c
++++ b/app/sanity.c
+@@ -118,7 +118,7 @@ sanity_check_gimp (void)
+ "The GIMP binary cannot run with a libgimp version\n"
+ "other than its own. This is GIMP %d.%d.%d, but the\n"
+ "libgimp version is %d.%d.%d.\n\n"
+- "Maybe you have GIMP versions in both /usr and /usr/local ?",
++ "Maybe you have GIMP versions in both /usr and /opt/csw ?",
+ GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION, GIMP_MICRO_VERSION,
+ gimp_major_version, gimp_minor_version, gimp_micro_version);
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list