Date: Sat, 30 Mar 2013 10:14:49 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315605 - in head/graphics: fotoxx fotoxx/files picpuz picpuz/files Message-ID: <201303301014.r2UAEn0L077436@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Mar 30 10:14:48 2013 New Revision: 315605 URL: http://svnweb.freebsd.org/changeset/ports/315605 Log: Fix the build after glib 2.34 update. Submitted by: miwi Approved by: portmgr (miwi) Obtained from: debian patchtracker (adapted from) Modified: head/graphics/fotoxx/Makefile head/graphics/fotoxx/files/patch-fotoxx-11.03.cc head/graphics/fotoxx/files/patch-zfuncs.cc head/graphics/fotoxx/files/patch-zfuncs.h head/graphics/picpuz/Makefile head/graphics/picpuz/files/patch-zfuncs.cpp head/graphics/picpuz/files/patch-zfuncs.h Modified: head/graphics/fotoxx/Makefile ============================================================================== --- head/graphics/fotoxx/Makefile Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/fotoxx/Makefile Sat Mar 30 10:14:48 2013 (r315605) @@ -7,7 +7,7 @@ PORTNAME= fotoxx PORTVERSION= 11.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://kornelix.squarespace.com/downloads/ \ http://www.rodperson.com/DL/ Modified: head/graphics/fotoxx/files/patch-fotoxx-11.03.cc ============================================================================== --- head/graphics/fotoxx/files/patch-fotoxx-11.03.cc Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/fotoxx/files/patch-fotoxx-11.03.cc Sat Mar 30 10:14:48 2013 (r315605) @@ -1,5 +1,5 @@ ---- fotoxx-11.03.cc.orig 2011-02-28 17:04:24.000000000 +0100 -+++ fotoxx-11.03.cc 2011-05-26 10:36:11.000000000 +0200 +--- fotoxx-11.03.cc.orig 2011-02-28 16:04:24.000000000 +0000 ++++ fotoxx-11.03.cc 2013-03-30 08:59:16.000000000 +0000 @@ -24,6 +24,13 @@ #include <tiffio.h> #include "zfuncs.h" @@ -14,6 +14,15 @@ #define fversion "Fotoxx v.11.03 2011.03.01" // version and date #define fversioncc 16 // cc to use for window title bar #define flicense "Free software - GNU General Public License v.3" +@@ -200,7 +207,7 @@ + PXM *Dpxm16 = 0; // drawing window pixmap, 1x 16-bits + PXM *Dpxm8 = 0; // drawing window pixmap, Mscale 8-bits + +-mutex Fpixmap_lock; // lock for accessing PXM pixmaps ++mutex_tp Fpixmap_lock; // lock for accessing PXM pixmaps + + int Fww, Fhh; // input image dimensions + int E1ww, E1hh, E3ww, E3hh; // edit image dimensions @@ -986,7 +993,7 @@ } Modified: head/graphics/fotoxx/files/patch-zfuncs.cc ============================================================================== --- head/graphics/fotoxx/files/patch-zfuncs.cc Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/fotoxx/files/patch-zfuncs.cc Sat Mar 30 10:14:48 2013 (r315605) @@ -1,5 +1,5 @@ ---- zfuncs.cc.orig 2011-02-28 17:04:24.000000000 +0100 -+++ zfuncs.cc 2011-05-26 10:04:13.000000000 +0200 +--- zfuncs.cc.orig 2011-02-28 16:04:24.000000000 +0000 ++++ zfuncs.cc 2013-03-30 09:00:04.000000000 +0000 @@ -24,6 +24,15 @@ #include "zfuncs.h" @@ -16,6 +16,15 @@ /************************************************************************** system-level utility functions +@@ -281,7 +290,7 @@ + // safely access parameters from multiple threads + // limitation: one lock for any number of parameters + +-mutex zget_lock = PTHREAD_MUTEX_INITIALIZER; ++mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER; + + int zget_locked(int ¶m) // lock and return parameter + { @@ -778,23 +787,27 @@ char fname[200]; // null-terminated file name within directory }; @@ -117,3 +126,12 @@ if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname); // get /root/.appname else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // or /home/user/.appname +@@ -3435,7 +3441,7 @@ + pthread_t tids[tmax]; + int tlocks[tmax]; + int zinit = 0; +-mutex zmutex; ++mutex_tp zmutex; + + void zlockInit() // initz. call from main() + { Modified: head/graphics/fotoxx/files/patch-zfuncs.h ============================================================================== --- head/graphics/fotoxx/files/patch-zfuncs.h Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/fotoxx/files/patch-zfuncs.h Sat Mar 30 10:14:48 2013 (r315605) @@ -1,5 +1,5 @@ ---- zfuncs.h.orig 2011-02-28 17:04:24.000000000 +0100 -+++ zfuncs.h 2011-05-25 17:50:21.000000000 +0200 +--- zfuncs.h.orig 2011-02-28 16:04:24.000000000 +0000 ++++ zfuncs.h 2013-03-30 08:58:28.000000000 +0000 @@ -36,7 +36,13 @@ #include <signal.h> #include <execinfo.h> @@ -15,3 +15,21 @@ #define int8 char // number types #define int16 short +@@ -52,7 +58,7 @@ + + #define wstrerror(err) strerror(WEXITSTATUS(err)) // get text status for child process + +-#define mutex pthread_mutex_t // abbreviations ++#define mutex_tp pthread_mutex_t // abbreviations + #define mutex_init pthread_mutex_init + #define mutex_lock pthread_mutex_lock + #define mutex_trylock pthread_mutex_trylock +@@ -504,7 +510,7 @@ + { + char wmi[8]; + Vxstring * vd; // vector of xstrings +- mutex qmutex; // for multi-thread access ++ mutex_tp qmutex; // for multi-thread access + int qcap; // queue capacity + int qcount; // curr. queue count + int ent1; // first entry pointer Modified: head/graphics/picpuz/Makefile ============================================================================== --- head/graphics/picpuz/Makefile Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/picpuz/Makefile Sat Mar 30 10:14:48 2013 (r315605) @@ -7,7 +7,7 @@ PORTNAME= picpuz PORTVERSION= 2.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics games MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ Modified: head/graphics/picpuz/files/patch-zfuncs.cpp ============================================================================== --- head/graphics/picpuz/files/patch-zfuncs.cpp Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/picpuz/files/patch-zfuncs.cpp Sat Mar 30 10:14:48 2013 (r315605) @@ -1,7 +1,7 @@ ---- zfuncs.cpp.orig 2009-10-02 03:20:15.000000000 +0700 -+++ zfuncs.cpp 2009-10-07 12:35:45.000000000 +0700 +--- zfuncs.cpp.orig 2009-10-29 08:38:40.000000000 +0000 ++++ zfuncs.cpp 2013-03-30 09:06:21.000000000 +0000 @@ -23,6 +23,11 @@ - // zfuncs version v.2.25 + // zfuncs.cpp version v.2.28 #include "zfuncs.h" +#ifdef __FreeBSD__ @@ -12,7 +12,16 @@ /************************************************************************** system-level utility functions -@@ -2875,7 +2880,7 @@ +@@ -236,7 +241,7 @@ + // safely access parameters from multiple threads + // limitation: one lock for any number of parameters + +-mutex zget_lock = PTHREAD_MUTEX_INITIALIZER; ++mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER; + + int zget_locked(int ¶m) // lock and return parameter + { +@@ -2916,7 +2921,7 @@ strcpy(zicondir,zdatadir); strcat(zicondir,"/icons"); @@ -21,3 +30,12 @@ if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname); // get /root/.appname else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // or /home/user/.appname +@@ -3415,7 +3420,7 @@ + pthread_t tids[tmax]; + int tlocks[tmax]; + int zinit = 0; +-mutex zmutex; ++mutex_tp zmutex; + + void zlockInit() // initz. call from main() + { Modified: head/graphics/picpuz/files/patch-zfuncs.h ============================================================================== --- head/graphics/picpuz/files/patch-zfuncs.h Sat Mar 30 10:11:19 2013 (r315604) +++ head/graphics/picpuz/files/patch-zfuncs.h Sat Mar 30 10:14:48 2013 (r315605) @@ -1,6 +1,6 @@ ---- zfuncs.h.orig 2009-10-07 08:40:43.000000000 +0700 -+++ zfuncs.h 2009-10-07 08:50:37.000000000 +0700 -@@ -19,7 +19,201 @@ +--- zfuncs.h.orig 2009-10-29 08:38:40.000000000 +0000 ++++ zfuncs.h 2013-03-30 09:03:57.000000000 +0000 +@@ -36,7 +36,201 @@ #include <signal.h> #include <execinfo.h> #include <locale.h> @@ -203,3 +203,21 @@ #define int8 char // number types #define int16 short +@@ -52,7 +246,7 @@ + + #define wstrerror(err) strerror(WEXITSTATUS(err)) // get text status for child process + +-#define mutex pthread_mutex_t // abbreviations ++#define mutex_tp pthread_mutex_t // abbreviations + #define mutex_init pthread_mutex_init + #define mutex_lock pthread_mutex_lock + #define mutex_trylock pthread_mutex_trylock +@@ -495,7 +689,7 @@ + { + char wmi[8]; + Vxstring * vd; // vector of xstrings +- mutex qmutex; // for multi-thread access ++ mutex_tp qmutex; // for multi-thread access + int qcap; // queue capacity + int qcount; // curr. queue count + int ent1; // first entry pointer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303301014.r2UAEn0L077436>