On 2010/05/13 15:28, Ido Admon wrote:
> x11/xpad became unusable after recent gtk+ update - all windows
> ('pads') are blank and cannot be edited etc. Errors spewed in the
> terminal window:
>
> (xpad:30315): GLib-GObject-WARNING **: IA__g_object_set_valist:
> construct property "type" for object `XpadPad' can't be set after
> construction
>
>
> This little fix does the trick for me, and doesn't seem to have any
> side effects. Since current version upstream is 4 or so (ours is
> 2.14), there's not much chance that they'll bother to fix it themselves.
> - /* "type", GTK_WINDOW_TOPLEVEL, */
> + "type", GTK_WINDOW_TOPLEVEL,
Bleh, reversed diff. GTK_WINDOW_TOPLEVEL should be the default
anyway so I think this is safe.
Makes sense to update to the current version too while we're there.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xpad/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 21 Dec 2009 20:46:03 -0000 1.19
+++ Makefile 13 May 2010 13:41:39 -0000
@@ -2,11 +2,11 @@
COMMENT= virtual sticky pad system
-DISTNAME= xpad-2.14
-PKGNAME= ${DISTNAME:L}p4
+DISTNAME= xpad-4.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xpad/}
+MASTER_SITES= http://launchpad.net/xpad/trunk/4.0/+download/
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://xpad.sourceforge.net/
@@ -21,6 +21,7 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xre
WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png z pthread-stubs xcb
+WANTLIB += gthread-2.0 pthread xcb-render xcb-render-util
# GPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xpad/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Feb 2008 03:22:56 -0000 1.7
+++ distinfo 13 May 2010 13:41:39 -0000
@@ -1,5 +1,5 @@
-MD5 (xpad-2.14.tar.bz2) = HhLmrsjwOmVutkJ7oiw40w==
-RMD160 (xpad-2.14.tar.bz2) = YIVKL9jrtGiVYMYDcyXaHo7G02E=
-SHA1 (xpad-2.14.tar.bz2) = xMcSFtaDSmnfP66d4UrD/uGeonw=
-SHA256 (xpad-2.14.tar.bz2) = IFNCNKpOtEjWuK6MKWRjslmlbI3yoGnoJlP8OxuK6Jo=
-SIZE (xpad-2.14.tar.bz2) = 221859
+MD5 (xpad-4.0.tar.bz2) = p3u6u0kXx9qbXQl9mk5Zpw==
+RMD160 (xpad-4.0.tar.bz2) = 8MVxRSRj9vzb1JEuLOF4uqMh7Kg=
+SHA1 (xpad-4.0.tar.bz2) = nZx8Xtb+uKrJf8SL/NZiw7Dby6U=
+SHA256 (xpad-4.0.tar.bz2) = 1134V3fyN7ZOmiJIpjfjge6XbLfo65EVDomE0Jnfd5Y=
+SIZE (xpad-4.0.tar.bz2) = 180340
Index: patches/patch-src_xpad-pad_c
===================================================================
RCS file: patches/patch-src_xpad-pad_c
diff -N patches/patch-src_xpad-pad_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xpad-pad_c 13 May 2010 13:41:39 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+unbreak with gtk+2.2.0
+
+--- src/xpad-pad.c.orig Thu May 13 14:23:55 2010
++++ src/xpad-pad.c Thu May 13 14:38:28 2010
+@@ -275,7 +275,7 @@ xpad_pad_init (XpadPad *pad)
+ "gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving
pad x,y work */
+ "skip-pager-hint", !xpad_settings_get_has_decorations
(xpad_settings ()),
+ "skip-taskbar-hint", !xpad_settings_get_has_decorations
(xpad_settings ()),
+- "type", GTK_WINDOW_TOPLEVEL,
++ /* "type", GTK_WINDOW_TOPLEVEL, */
+ "type-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
+ "window-position", GTK_WIN_POS_MOUSE,
+ "child", vbox,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xpad/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 21 Dec 2009 20:46:03 -0000 1.9
+++ pkg/PLIST 13 May 2010 13:41:39 -0000
@@ -1,12 +1,9 @@
@comment $OpenBSD: PLIST,v 1.9 2009/12/21 20:46:03 ajacoutot Exp $
-bin/xpad
+...@bin bin/xpad
@man man/man1/xpad.1
share/applications/xpad.desktop
share/icons/
share/icons/hicolor/
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/xpad.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/xpad.svg
@@ -14,29 +11,38 @@ share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/xpad.mo
share/locale/bg/LC_MESSAGES/xpad.mo
+share/locale/cs/LC_MESSAGES/xpad.mo
share/locale/da/LC_MESSAGES/xpad.mo
+share/locale/de/LC_MESSAGES/xpad.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/xpad.mo
share/locale/es/LC_MESSAGES/xpad.mo
+share/locale/et/LC_MESSAGES/xpad.mo
share/locale/fi/LC_MESSAGES/xpad.mo
share/locale/fr/LC_MESSAGES/xpad.mo
share/locale/ga/LC_MESSAGES/xpad.mo
+share/locale/hr/LC_MESSAGES/xpad.mo
share/locale/hu/LC_MESSAGES/xpad.mo
share/locale/it/LC_MESSAGES/xpad.mo
+share/locale/ja/LC_MESSAGES/xpad.mo
share/locale/ko/LC_MESSAGES/xpad.mo
+share/locale/lv/LC_MESSAGES/xpad.mo
share/locale/nl/LC_MESSAGES/xpad.mo
+share/locale/pt/LC_MESSAGES/xpad.mo
share/locale/ro/LC_MESSAGES/xpad.mo
share/locale/ru/LC_MESSAGES/xpad.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/xpad.mo
share/locale/sv/LC_MESSAGES/xpad.mo
+share/locale/th/
+share/locale/th/LC_MESSAGES/
+share/locale/th/LC_MESSAGES/xpad.mo
+share/locale/tr/LC_MESSAGES/xpad.mo
share/locale/vi/LC_MESSAGES/xpad.mo
share/locale/zh_CN/LC_MESSAGES/xpad.mo
share/locale/zh_TW/LC_MESSAGES/xpad.mo
-share/pixmaps/
-share/pixmaps/xpad.png
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
@exec %D/bin/update-desktop-database
