(pkgsrc)

- Drop patch-ac, it is now included in upstream.

(upstream)
- Updated x11/xpad 4.0 to 4.8
---------------------------
Version 4.8
* Fix: Autostart - Pads did not hide on startup when set in the preferences
  due to the tray icon not being recognized properly (#1560019)

Version 4.7
* Fix: Translations - Updated the translation template, so translaters can
  translate the new or changed strings (#1531634)
* Fix: Autostart - Partial undo of bug report #1395889, preventing autoset
  of system-wide autostart of Xpad (#1517262)
* Fix: Autostart - If Xpad is run for the first time, autostart for the
  current user will be enabled. (#1517262)
* Fix: Technical - The info file of a pad was only saved on proper exit of
  Xpad (#1534925)

Version 4.6
* New: Preferences - The ability to hide the pads from the taskbar (which
  was previously binded to window decorations) (#1029202)
* New: Preferences - The ability to hide the pads from the workspace
  switcher (which was previously binded to window decorations) (#1340331)
* Fix: CLI - the show, hide and toggle command-line options have been fixed
  (#1424081)
* Fix: Menu - Limited the length of the note names in the menu items to 20
  characters. This prevents very wide stretched menus.
* Fix: Internationalization - Added and updated the Xpad.pot file to
  restore the multi-lingual support (#1455888)
* Fix: Help - Set the ability to select and copy the help text (#1415138)
* Fix: Pad focus - Improved the showing and focussing of pads after
  minimization or creation of a new pad.
* Fix: Pad focus - After deleting a pad, it is conveniant to have the focus
  on another pad. This fix added that behavior.
* Fix: Performance - Only save the location of the pad to disk when exiting
  Xpad. This prevents a lot of disk writes when moving pads. (#1459251)
* Fix: Default settings - Window decorations are turned off by default (#1395889)
* Fix: Default settings - Autostart Xpad by default for all users (#1395889)
* Fix: Technical - Code cleanup - removed spaces and indentions
* Fix: Technical - Prevent deprecated error messages when not using
  configure --enable-debug=yes
* Fix: Technical - Changed preference window type from GtkDialog to GtkWindow (#1395309)
* Fix: Technical - Prevent race condition when application shutdown is requested
* Fix: Technical - Initialized uninitialized variable
* Fix: Technical - Replaced or removed deprecated GTK functions, such as gtk_alignment_new
* Fix: Technical - Removed debugging implementaton, since it was not used
  and uses unnecessary resources

Version 4.5
* New: Debug - ability to use built-in debugging functionality for bug
  solving and code improvements by Sagar Ghuge (#1389334)
* New: Systray - ability to open the help from the tray icon menu (#1406378)
* Many bugfixes: see Changelog

Version 4.4
* Only bugfixes and technical changes: see Changelog

Version 4.3
* New: Systray - ability to hide the tray icon
* New: Toolbar - ability to add multiple separators
* New: Toolbar - ability to add paste button on toolbar
* New: Autostart - Ability to set the automatic start of Xpad in the
  Preferences menu
* New: Autostart - Ability to set the wait for systray option in the
  Preferences menu
* New: Autostart - Ability to delay the start of Xpad in the Preferences
  menu
* New: Autostart - Ability to set the automatic creation of a new pad at
  the start of Xpad in the Preferences menu
* New: Autostart - Ability to set the automatic open/hide/restore of all
  pads at the start of Xpad in the Preferences menu
* New: Shortcuts - Added shortcuts keys for New pad (CTRL-N) and Delete
  (SHIFT-DEL) and changed Redo from (CTRL-R) to (CTRL-Y)
* Many bugfixes: see Changelog

Version 4.2
* New: Undo/redo functionality such as CTRL-Z
* New: ability to reconfigure the left-right click behaviour of the tray icon
* Many bugfixes: see Changelog

Version 4.1
* Undo/Redo for xpad and bug-fixes. Feature by Sergei Riaguzov
* Bug #490445: crash when right-clicking on tray icon to display list of
  notes. Patch by David Hull
* Bug #360142: Add keyboard shortcuts for formatting. Patch by Dennis Hilmar
* Bug #591978: xpad critical start. Patch by OBATA Akio

4 files changed, 11 insertions, 42 deletions

diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 9e715f3ac95..d08ae094f18 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/04/25 14:25:25 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2016/07/21 11:10:02 mef Exp $
 #
 
-DISTNAME=	xpad-4.0
-PKGREVISION=	16
+DISTNAME=	xpad-4.8.0
 CATEGORIES=	x11
 MASTER_SITES=	http://launchpad.net/xpad/trunk/${PKGVERSION_NOREV}/+download/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,6 +17,7 @@ USE_PKGLOCALEDIR=	yes
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/PLIST b/x11/xpad/PLIST
index 48aab85147d..640f8c92d5d 100644
--- a/x11/xpad/PLIST
+++ b/x11/xpad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/01/25 08:33:27 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/07/21 11:10:02 mef Exp $
 bin/xpad
 man/man1/xpad.1
 share/applications/xpad.desktop
@@ -31,3 +31,4 @@ 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/xpad/help/xpad-user-help.txt
diff --git a/x11/xpad/distinfo b/x11/xpad/distinfo
index 3c9cc922968..c6307a2efb9 100644
--- a/x11/xpad/distinfo
+++ b/x11/xpad/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:29:10 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/07/21 11:10:02 mef Exp $
 
-SHA1 (xpad-4.0.tar.bz2) = 9d9c7c5ed6feb8aac97fc48bfcd662c3b0dbcba5
-RMD160 (xpad-4.0.tar.bz2) = f0c571452463f6fcdbd4912e2ce178baa321eca8
-SHA512 (xpad-4.0.tar.bz2) = ab28f36fe1c393370abfec575e79df49bb2596e14817a8b87f2e94b1df5df5d0eb77eb8ea0c6b7da3521b18905ec63de681d4ff8a92fccd3e4cd464e35a55f46
-Size (xpad-4.0.tar.bz2) = 180340 bytes
+SHA1 (xpad-4.8.0.tar.bz2) = 0810b4fc9a082a762b3c32898d8ea8590028d20f
+RMD160 (xpad-4.8.0.tar.bz2) = c15513b71d6a4f112da0932ac15ccacdea36390f
+SHA512 (xpad-4.8.0.tar.bz2) = 286afe23ace31e983c7db44231600dfb5c9ef2faa82b5560df3e1ab0b64deba2bee52cf805b728b12705b899ac3f3bc9715bc77d0d7e01dd692b9802edd358fe
+Size (xpad-4.8.0.tar.bz2) = 247547 bytes
 SHA1 (patch-ac) = 3a820f19db4a46eec8d63cb61912a01508a49940
diff --git a/x11/xpad/patches/patch-ac b/x11/xpad/patches/patch-ac
deleted file mode 100644
index ca49fa568ea..00000000000
--- a/x11/xpad/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/01/27 05:26:50 obache Exp $
-
-* Use API for set window properties.
-  construct property "type" for object can't be set after construction.
-  https://bugs.launchpad.net/xpad/+bug/591978
-
---- 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);
-