summaryrefslogtreecommitdiff
path: root/x11/xpad
diff options
context:
space:
mode:
Diffstat (limited to 'x11/xpad')
-rw-r--r--x11/xpad/Makefile21
-rw-r--r--x11/xpad/PLIST33
-rw-r--r--x11/xpad/distinfo9
-rw-r--r--x11/xpad/patches/patch-ac31
4 files changed, 65 insertions, 29 deletions
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 778e4eab0dc..823b448f5e1 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.33 2011/01/13 13:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2011/01/25 08:33:27 obache Exp $
#
-DISTNAME= xpad-1.12
-PKGREVISION= 13
+DISTNAME= xpad-4.0
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xpad/}
+MASTER_SITES= http://launchpad.net/xpad/trunk/${PKGVERSION_NOREV}/+download/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://xpad.sourceforge.net/
-COMMENT= Sticky notes application in GTK 2
+HOMEPAGE= http://mterry.name/xpad/
+COMMENT= Sticky notes application for GTK+ 2.0
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,15 +17,8 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
-LIBS.SunOS+= -lX11
-
-BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/PLIST b/x11/xpad/PLIST
index cc7877780b6..48aab85147d 100644
--- a/x11/xpad/PLIST
+++ b/x11/xpad/PLIST
@@ -1,22 +1,33 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:25:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/01/25 08:33:27 obache Exp $
bin/xpad
man/man1/xpad.1
share/applications/xpad.desktop
-share/icons/hicolor/128x128/apps/xpad.png
-share/icons/hicolor/16x16/apps/xpad.png
-share/icons/hicolor/22x22/apps/xpad.png
-share/icons/hicolor/32x32/apps/xpad.png
-share/icons/hicolor/48x48/apps/xpad.png
-share/icons/hicolor/64x64/apps/xpad.png
-share/icons/hicolor/96x96/apps/xpad.png
share/icons/hicolor/scalable/apps/xpad.svg
-share/locale/dk/LC_MESSAGES/xpad.mo
-share/locale/eo/LC_MESSAGES/xpad.mo
+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/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/pixmaps/xpad.png
+share/locale/rw/LC_MESSAGES/xpad.mo
+share/locale/sv/LC_MESSAGES/xpad.mo
+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
diff --git a/x11/xpad/distinfo b/x11/xpad/distinfo
index b8448d0f019..d6001e576c2 100644
--- a/x11/xpad/distinfo
+++ b/x11/xpad/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 17:36:25 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/01/25 08:33:27 obache Exp $
-SHA1 (xpad-1.12.tar.bz2) = 39785fb183d61039383204352ba03c4ca4cb392d
-RMD160 (xpad-1.12.tar.bz2) = b2ca21e60bc550f74e92c1ee3f06529f46b87751
-Size (xpad-1.12.tar.bz2) = 238411 bytes
+SHA1 (xpad-4.0.tar.bz2) = 9d9c7c5ed6feb8aac97fc48bfcd662c3b0dbcba5
+RMD160 (xpad-4.0.tar.bz2) = f0c571452463f6fcdbd4912e2ce178baa321eca8
+Size (xpad-4.0.tar.bz2) = 180340 bytes
+SHA1 (patch-ac) = d48f055a6006c39d55e01ccd9888cd2494e46f41
diff --git a/x11/xpad/patches/patch-ac b/x11/xpad/patches/patch-ac
new file mode 100644
index 00000000000..8652bfb9e38
--- /dev/null
+++ b/x11/xpad/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2011/01/25 08:33:27 obache Exp $
+
+* Use API for set window properties.
+ construct property "type" for object can't be set after construction.
+
+--- src/xpad-pad.c.orig 2009-05-11 01:44:09.000000000 +0000
++++ src/xpad-pad.c
+@@ -268,16 +268,14 @@ xpad_pad_init (XpadPad *pad)
+ NULL));
+ gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
+
++ gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_settings ()));
++ gtk_window_set_default_size (GTK_WINDOW(pad), xpad_settings_get_width (xpad_settings ()), xpad_settings_get_height (xpad_settings ()));
++ gtk_window_set_gravity (GTK_WINDOW(pad), GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
++ gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_settings ()));
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_settings ()));
++ gtk_window_set_type_hint (GTK_WINDOW(pad), GDK_WINDOW_TYPE_HINT_NORMAL);
++ gtk_window_set_position (GTK_WINDOW(pad), GTK_WIN_POS_MOUSE);
+ g_object_set (G_OBJECT (pad),
+- "decorated", xpad_settings_get_has_decorations (xpad_settings ()),
+- "default-height", xpad_settings_get_height (xpad_settings ()),
+- "default-width", xpad_settings_get_width (xpad_settings ()),
+- "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-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
+- "window-position", GTK_WIN_POS_MOUSE,
+ "child", vbox,
+ NULL);
+