ports/142839: [PATCH] graphics/gsnapshot: update to 1.1
Bernhard Froehlich
decke at bluelife.at
Thu Jan 14 20:50:01 UTC 2010
>Number: 142839
>Category: ports
>Synopsis: [PATCH] graphics/gsnapshot: update to 1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 14 20:50:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Bernhard Froehlich
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD chii.bluelife.at 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Jan 8 09:39:23 CET
>Description:
- Update to 1.1
Added file(s):
- files/patch-src_common_filechooser.c
- files/patch-src_common_language.c
- files/patch-src_programs_Makefile.am
Removed file(s):
- files/patch-src__language.c
- files/patch-src_filechooser.c
- files/patch-src_gdisplay.c
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- gsnapshot-1.1.patch begins here ---
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/Makefile /usr/ports/graphics/gsnapshot/Makefile
--- /usr/ports/graphics/gsnapshot.orig/Makefile 2009-08-22 02:22:51.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/Makefile 2010-01-14 21:36:16.000000000 +0100
@@ -6,22 +6,20 @@
#
PORTNAME= gsnapshot
-PORTVERSION= 1.0
-PORTREVISION= 4
+PORTVERSION= 1.1
CATEGORIES= graphics
MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= A gtk+ based screen capture
-USE_AUTOTOOLS= automake:15:env libtool:22
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-USE_XORG= x11
+USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
+USE_GNOME= pkgconfig gtk20 libwnck libxml2
+USE_XORG= x11 xmu
-WRKSRC= ${WRKDIR}/${PORTNAME}
+CFLAGS+= -fPIC -I${LOCALBASE}/include/libxml2
-PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+PORTDOCS= AUTHORS COPYING INSTALL README TODO
DESKTOP_ENTRIES= "gsnapshot" \
"A gtk+ based screen capture" \
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/distinfo /usr/ports/graphics/gsnapshot/distinfo
--- /usr/ports/graphics/gsnapshot.orig/distinfo 2007-07-28 23:30:46.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/distinfo 2010-01-14 21:36:16.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (gsnapshot-1.0.tar.gz) = ef609075546f38e7a14f6ca59f8187df
-SHA256 (gsnapshot-1.0.tar.gz) = 69dd5826ab94e65e04c5177789c8cd899ed6245e8aebf446fe250a1f32d55192
-SIZE (gsnapshot-1.0.tar.gz) = 182662
+MD5 (gsnapshot-1.1.tar.gz) = bf4d183f6fd51ba3ac7cedbaad4cd3f1
+SHA256 (gsnapshot-1.1.tar.gz) = 1b76e58a223fe9a179fd351c63310fde1e2824dbd2252be4b1ddb4b57145b146
+SIZE (gsnapshot-1.1.tar.gz) = 502229
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src__language.c /usr/ports/graphics/gsnapshot/files/patch-src__language.c
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src__language.c 2008-05-06 09:38:19.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/files/patch-src__language.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- ./src/language.c.orig 2007-07-16 01:05:23.000000000 +0300
-+++ ./src/language.c 2008-05-06 10:20:22.000000000 +0300
-@@ -335,6 +335,9 @@
- {
- if (spoken == NULL) {
- char *lang = getenv("LANG");
-+ if(!lang)
-+ return TranslationEnglish[label].locale;
-+
- if (strcmp(lang, "de") == 0 || strcmp(lang, "de_DE") == 0)
- spoken = TranslationGerman;
- else if (strcmp(lang, "es") == 0 || strcmp(lang, "es_ES") == 0)
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src_common_filechooser.c /usr/ports/graphics/gsnapshot/files/patch-src_common_filechooser.c
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src_common_filechooser.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/graphics/gsnapshot/files/patch-src_common_filechooser.c 2010-01-13 21:16:33.000000000 +0100
@@ -0,0 +1,20 @@
+--- src/common/filechooser.c.orig 2007-09-05 10:18:50.000000000 +0200
++++ src/common/filechooser.c 2010-01-13 21:16:11.000000000 +0100
+@@ -19,9 +19,16 @@
+ */
+
+ #include "filechooser.h"
++#include <sys/param.h>
+
+ #ifndef get_current_dir_name
+-extern char *get_current_dir_name(void);
++extern char *
++get_current_dir_name(void)
++{
++ char *buf = malloc(MAXPATHLEN);
++ getwd(buf);
++ return buf;
++}
+ #endif
+
+ /*
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src_common_language.c /usr/ports/graphics/gsnapshot/files/patch-src_common_language.c
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src_common_language.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/graphics/gsnapshot/files/patch-src_common_language.c 2010-01-13 21:08:30.000000000 +0100
@@ -0,0 +1,12 @@
+--- src/common/language.c.orig 2007-07-28 15:49:17.000000000 +0200
++++ src/common/language.c 2010-01-13 21:07:22.000000000 +0100
+@@ -335,6 +335,9 @@
+ {
+ if (spoken == NULL) {
+ char *lang = getenv("LANG");
++ if(!lang)
++ return TranslationEnglish[label].locale;
++
+ if (strcmp(lang, "de") == 0 || strcmp(lang, "de_DE") == 0)
+ spoken = TranslationGerman;
+ else if (strcmp(lang, "es") == 0 || strcmp(lang, "es_ES") == 0)
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src_filechooser.c /usr/ports/graphics/gsnapshot/files/patch-src_filechooser.c
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src_filechooser.c 2007-07-28 23:30:46.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/files/patch-src_filechooser.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
---- src/filechooser.c.orig Mon Jul 16 06:05:22 2007
-+++ src/filechooser.c Mon Jul 23 21:26:21 2007
-@@ -19,9 +19,14 @@
- */
-
- #include "filechooser.h"
-+#include <sys/param.h>
-
- #ifndef get_current_dir_name
--extern char *get_current_dir_name(void);
-+extern char *get_current_dir_name_2() {
-+ char *buf = malloc(MAXPATHLEN);
-+ getwd(buf);
-+ return buf;
-+}
- #endif
-
- /*
-@@ -325,7 +330,7 @@
- gchar *path;
-
- if (dirname == FILECHOOSER_CWD)
-- path = (gchar *)get_current_dir_name ();
-+ path = (gchar *)get_current_dir_name_2 ();
- else
- path = (gchar *)dirname;
-
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src_gdisplay.c /usr/ports/graphics/gsnapshot/files/patch-src_gdisplay.c
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src_gdisplay.c 2007-07-28 23:30:46.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/files/patch-src_gdisplay.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
---- src/gdisplay.c.orig Mon Jul 16 06:05:23 2007
-+++ src/gdisplay.c Mon Jul 23 20:28:31 2007
-@@ -19,9 +19,14 @@
-
- #include "gdisplay.h"
- #include "language.h"
-+#include <sys/param.h>
-
- #ifndef get_current_dir_name
--extern char *get_current_dir_name(void);
-+extern char *get_current_dir_name() {
-+ char *buf = malloc(MAXPATHLEN);
-+ getwd(buf);
-+ return buf;
-+}
- #endif
-
- static gdisplay_t global; /* (protected) encapsulated program data */
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/files/patch-src_programs_Makefile.am /usr/ports/graphics/gsnapshot/files/patch-src_programs_Makefile.am
--- /usr/ports/graphics/gsnapshot.orig/files/patch-src_programs_Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/graphics/gsnapshot/files/patch-src_programs_Makefile.am 2010-01-13 22:01:17.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/programs/Makefile.am.orig 2007-09-30 17:41:11.000000000 +0200
++++ src/programs/Makefile.am 2010-01-13 22:01:00.000000000 +0100
+@@ -18,7 +18,7 @@
+ gpanel
+
+ # additional LDFLAGS per program
+-gpanel_LDADD = -lwnck -lxml2
++gpanel_LDADD = -lwnck-1 -lxml2
+
+ # program source dependencies
+ gsnapshot_SOURCES = gsnapshot.h gsnapshot.c
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/graphics/gsnapshot.orig/pkg-plist /usr/ports/graphics/gsnapshot/pkg-plist
--- /usr/ports/graphics/gsnapshot.orig/pkg-plist 2007-07-28 23:30:46.000000000 +0200
+++ /usr/ports/graphics/gsnapshot/pkg-plist 2010-01-14 21:36:16.000000000 +0100
@@ -1,11 +1,104 @@
+bin/gcontrol
bin/gdisplay
+bin/gpanel
bin/gsnapshot
include/dialog.h
+include/docklet.h
include/filechooser.h
include/grabber.h
include/iconbox.h
include/language.h
+include/module.h
include/print.h
include/window.h
+include/xmlconfig.h
include/xpmglyphs.h
lib/libsnapshot.a
+share/panel/config
+share/panel/pixmaps/apps.png
+share/panel/pixmaps/audio.png
+share/panel/pixmaps/battery.png
+share/panel/pixmaps/bulb.png
+share/panel/pixmaps/calculator.png
+share/panel/pixmaps/calendar.png
+share/panel/pixmaps/camera.png
+share/panel/pixmaps/cdrecord.png
+share/panel/pixmaps/clipboard.png
+share/panel/pixmaps/clock.png
+share/panel/pixmaps/colors.png
+share/panel/pixmaps/designer.png
+share/panel/pixmaps/disks.png
+share/panel/pixmaps/earth.png
+share/panel/pixmaps/editcut.png
+share/panel/pixmaps/editicon.png
+share/panel/pixmaps/editor.png
+share/panel/pixmaps/email.png
+share/panel/pixmaps/exec.png
+share/panel/pixmaps/exit.png
+share/panel/pixmaps/firefox.png
+share/panel/pixmaps/flashdrive.png
+share/panel/pixmaps/folder.png
+share/panel/pixmaps/games.png
+share/panel/pixmaps/gears.png
+share/panel/pixmaps/generic.png
+share/panel/pixmaps/gimp.png
+share/panel/pixmaps/graphics.png
+share/panel/pixmaps/graveman.png
+share/panel/pixmaps/hardinfo.png
+share/panel/pixmaps/home.png
+share/panel/pixmaps/icon.png
+share/panel/pixmaps/icons.png
+share/panel/pixmaps/identity.png
+share/panel/pixmaps/image.png
+share/panel/pixmaps/info.png
+share/panel/pixmaps/launch.png
+share/panel/pixmaps/lock.png
+share/panel/pixmaps/logout.png
+share/panel/pixmaps/mail.png
+share/panel/pixmaps/mixer.png
+share/panel/pixmaps/mount.png
+share/panel/pixmaps/mouse.png
+share/panel/pixmaps/multimedia.png
+share/panel/pixmaps/network.png
+share/panel/pixmaps/packages.png
+share/panel/pixmaps/password.png
+share/panel/pixmaps/power.png
+share/panel/pixmaps/printer.png
+share/panel/pixmaps/question.png
+share/panel/pixmaps/recycle.png
+share/panel/pixmaps/restart.png
+share/panel/pixmaps/run.png
+share/panel/pixmaps/screensaver.png
+share/panel/pixmaps/search.png
+share/panel/pixmaps/settings.png
+share/panel/pixmaps/shot.png
+share/panel/pixmaps/showdesktop.png
+share/panel/pixmaps/snapshot.png
+share/panel/pixmaps/star.png
+share/panel/pixmaps/startx.png
+share/panel/pixmaps/style.png
+share/panel/pixmaps/system.png
+share/panel/pixmaps/tasklist.png
+share/panel/pixmaps/terminal.png
+share/panel/pixmaps/thunderbird.png
+share/panel/pixmaps/trashcan.png
+share/panel/pixmaps/tunes.png
+share/panel/pixmaps/usbdrive.png
+share/panel/pixmaps/utilities.png
+share/panel/pixmaps/volume.png
+share/panel/pixmaps/warning.png
+share/panel/pixmaps/weather.png
+share/panel/pixmaps/welcome.png
+share/panel/pixmaps/wizard.png
+share/panel/pixmaps/workspace.png
+share/panel/pixmaps/x.png
+share/panel/pixmaps/xmedia.png
+share/panel/plugins/battery.so
+share/panel/plugins/clock.so
+share/panel/plugins/mixer.so
+share/panel/plugins/showdesktop.so
+share/panel/plugins/splash.so
+share/panel/plugins/xlock.so
+ at dirrm share/panel/plugins
+ at dirrm share/panel/pixmaps
+ at dirrm share/panel
--- gsnapshot-1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list