diff options
| author | glewis <glewis@FreeBSD.org> | 2013-07-08 07:01:43 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2013-07-08 07:01:43 +0800 |
| commit | eefcb867dd13b172f98a617d8b2aa632c36b0152 (patch) | |
| tree | 0cc2267690a92c0b691441afaee08da5c64f19ee /x11-wm/afterstep-stable/files | |
| parent | ccb78214350a12e1bd2d5dfacdaceb6c5cc331fa (diff) | |
| download | freebsd-ports-gnome-eefcb867dd13b172f98a617d8b2aa632c36b0152.tar.gz freebsd-ports-gnome-eefcb867dd13b172f98a617d8b2aa632c36b0152.tar.zst freebsd-ports-gnome-eefcb867dd13b172f98a617d8b2aa632c36b0152.zip | |
. Update to 2.2.12.
. Pet portlint some:
. Switch to new style header.
. Use MASTER_SITE_AFTERSTEP.
. s/file/f/ in .for loops.
Diffstat (limited to 'x11-wm/afterstep-stable/files')
| -rw-r--r-- | x11-wm/afterstep-stable/files/patch-configure | 18 | ||||
| -rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterImage-export.c | 11 | ||||
| -rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterImage-import.c | 19 |
3 files changed, 9 insertions, 39 deletions
diff --git a/x11-wm/afterstep-stable/files/patch-configure b/x11-wm/afterstep-stable/files/patch-configure index 3ae52c9596a0..066581d04b12 100644 --- a/x11-wm/afterstep-stable/files/patch-configure +++ b/x11-wm/afterstep-stable/files/patch-configure @@ -2,15 +2,6 @@ $FreeBSD$ --- configure Sat Jun 24 21:55:24 2006 +++ configure.orig Sat Jun 24 21:54:41 2006 -@@ -1811,7 +1811,7 @@ - # Check whether --enable-reuse-font or --disable-reuse-font was given. - if test "${enable_reuse_font+set}" = set; then - enableval="$enable_reuse_font" -- if test x$enableval == "xyes"; then -+ if test x$enableval = "xyes"; then - cat >>confdefs.h <<\_ACEOF - #define MODULE_REUSE_LOADED_FONT 1 - _ACEOF @@ -7955,7 +7955,7 @@ fi @@ -38,3 +29,12 @@ $FreeBSD$ AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a" AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a" AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a" +@@ -7660,7 +7660,7 @@ + + fi + +- export CFLAGS=$gio_saved_cflags ++ export CFLAGS="$gio_saved_cflags" + + present_libs="$LDFLAGS $LIBS $x_libs $AFTERIMAGE_LIBS"; + for l in `echo "$GIOLIB_LIBS"`; do diff --git a/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c b/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c deleted file mode 100644 index 2c5e7660c5bb..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterImage/export.c.orig 2010-09-23 22:52:15.000000000 +0200 -+++ libAfterImage/export.c 2012-05-06 07:25:17.000000000 +0200 -@@ -496,7 +496,7 @@ - png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if ( png_ptr != NULL ) - if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) -- if( setjmp(png_ptr->jmpbuf) ) -+ if( setjmp(png_jmpbuf(png_ptr)) ) - { - png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); - info_ptr = NULL ; diff --git a/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c b/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c deleted file mode 100644 index bef85880f392..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libAfterImage/import.c.orig 2010-09-23 22:57:57.000000000 +0200 -+++ libAfterImage/import.c 2012-05-06 09:30:26.000000000 +0200 -@@ -40,6 +40,7 @@ - # else - # include <png.h> - # endif -+# include <pngpriv.h> - #else - # include <setjmp.h> - # ifdef HAVE_JPEG -@@ -1251,7 +1252,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if ( !setjmp (png_ptr->jmpbuf)) -+ if ( !setjmp (png_jmpbuf(png_ptr))) - { - ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; - |