cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix goption warning, consequence of the update to glib-2.28.2.

Browse Source 
Ok ajacoutot@, landry@
This commit is contained in:
dcoppa 2011-04-16 07:47:04 +00:00
parent 8c191166fb
commit 6ff73abfa2
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/gimp/stable/Makefile
View File

@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.69 2010/12/03 16:33:59 giovanni Exp $
# $OpenBSD: Makefile,v 1.70 2011/04/16 07:47:04 dcoppa Exp $
COMMENT= GNU Image Manipulation Program
DISTNAME= gimp-2.6.11
REVISION= 0
SHARED_LIBS= gimp-2.0 271.0 \
gimpbase-2.0 271.0 \
gimpcolor-2.0 271.0 \

18
graphics/gimp/stable/patches/patch-app_main_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-app_main_c,v 1.1 2011/04/16 07:47:04 dcoppa Exp $
Using G_OPTION_FLAG_NO_ARG with G_OPTION_ARG_NONE is not a valid
combination and glib 2.28.2 warns about it.
http://git.gnome.org/browse/gimp/commit/?id=b81276ca83e6ec4c7df32c8f611f441d1dfc59ad
--- app/main.c.orig Fri Apr 15 20:18:24 2011
+++ app/main.c Fri Apr 15 20:19:15 2011
@@ -240,7 +240,7 @@ static const GOptionEntry main_entries[] =
N_("Debug in case of a crash (never|query|always)"), "<mode>"
},
{
- "debug-handlers", 0, G_OPTION_FLAG_NO_ARG,
+ "debug-handlers", 0, 0,
G_OPTION_ARG_NONE, &use_debug_handler,
N_("Enable non-fatal debugging signal handlers"), NULL
},

10
graphics/gimp/stable/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.9 2010/07/08 16:16:51 giovanni Exp $
--- configure.in.orig Mon Jun 21 21:20:20 2010
+++ configure.in Fri Jun 25 18:47:26 2010
$OpenBSD: patch-configure_in,v 1.10 2011/04/16 07:47:04 dcoppa Exp $
--- configure.in.orig Sun Oct 3 14:04:42 2010
+++ configure.in Fri Apr 15 20:17:58 2011
@@ -421,14 +421,7 @@ AM_GLIB_GNU_GETTEXT
###########
@ -27,7 +27,7 @@ $OpenBSD: patch-configure_in,v 1.9 2010/07/08 16:16:51 giovanni Exp $
AC_MSG_RESULT(yes)], [
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for isfinite in <math.h>)
@@ -1143,10 +1137,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
@@ -1146,10 +1140,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
@ -40,7 +40,7 @@ $OpenBSD: patch-configure_in,v 1.9 2010/07/08 16:16:51 giovanni Exp $
else
have_libmng="no (MNG header file not found)"
fi
@@ -1325,19 +1319,9 @@ if test "x$with_gnomevfs" != xno; then
@@ -1328,19 +1322,9 @@ if test "x$with_gnomevfs" != xno; then
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"