Hi ports --
Attached is a diff to update x11/nitrogen to its latest version. Most of
the patches go away.
Background gets set on amd64!
Take maintainer.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/nitrogen/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile 31 May 2017 08:08:18 -0000 1.18
+++ Makefile 10 Jun 2017 14:50:21 -0000
@@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.18 2017/05/31 08:08:18 espie Exp $
-# XXX check if still needed at next update
-CXXFLAGS += -std=c++11
-
COMMENT= background browser and setter for X11
-DISTNAME= nitrogen-1.5.2
-REVISION= 9
+DISTNAME= nitrogen-1.6.1
CATEGORIES= x11 graphics
HOMEPAGE= http://projects.l3ib.org/nitrogen/
+MAINTAINER= Brian Callahan <[email protected]>
-# GPLv2
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
@@ -19,20 +16,22 @@ WANTLIB += Xrandr Xrender atk-1.0 atkmm-
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 gtkmm-2.4 intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pangomm-1.4 pthread sigc-2.0 z $(LIBESTDC)
+WANTLIB += pangoft2-1.0 pangomm-1.4 pthread sigc-2.0 z ${LIBCXX}
-MASTER_SITES= ${HOMEPAGE}/files/
+MASTER_SITES= ${HOMEPAGE}files/
# c++11
COMPILER = gcc
LIB_DEPENDS= devel/gettext \
x11/gtk2mm
-RUN_DEPENDS= x11/gtk+3,-guic
+RUN_DEPENDS= x11/gtk+3,-guic \
+ devel/desktop-file-utils
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-inotify
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+MAKE_FLAGS= CXXFLAGS="${CXXFLAGS} -std=c++11"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/nitrogen/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 21 Sep 2012 08:51:47 -0000 1.3
+++ distinfo 10 Jun 2017 14:50:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (nitrogen-1.5.2.tar.gz) = YKJDfOamwLpEUF/IBmwZcxQNS7SOHlZJ9SXHsLi/n9I=
-SIZE (nitrogen-1.5.2.tar.gz) = 307356
+SHA256 (nitrogen-1.6.1.tar.gz) = 9AITcHt6O+h+VW9lUhzvh5W9ka/aE9+sjwDDVQN1g30=
+SIZE (nitrogen-1.6.1.tar.gz) = 314332
Index: patches/patch-src_NWindow_cc
===================================================================
RCS file: patches/patch-src_NWindow_cc
diff -N patches/patch-src_NWindow_cc
--- patches/patch-src_NWindow_cc 10 Apr 2012 18:23:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-$OpenBSD: patch-src_NWindow_cc,v 1.1 2012/04/10 18:23:55 jasper Exp $
-
-Added keyboard shortcuts for quitting.
-
-From upstream git commit: d66f9af886692c946b4144271d8cca23483ba489
-
---- src/NWindow.cc.orig Tue Apr 10 20:17:46 2012
-+++ src/NWindow.cc Tue Apr 10 20:17:53 2012
-@@ -79,6 +79,33 @@ NWindow::NWindow (void) : apply (Gtk::Stock::APPLY), i
- // don't even worry about it!
- }
-
-+ // accel group for keyboard shortcuts
-+ // unfortunately we have to basically make a menu which we never add to the UI
-+ m_action_group = Gtk::ActionGroup::create();
-+ m_action_group->add(Gtk::Action::create("FileMenu", ""));
-+ m_action_group->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),
-+ Gtk::AccelKey("<control>Q"),
-+ sigc::mem_fun(*this, &NWindow::sighandle_accel_quit));
-+
-+ m_action_group->add(Gtk::Action::create("Close", Gtk::Stock::CLOSE),
-+ Gtk::AccelKey("<control>W"),
-+ sigc::mem_fun(*this, &NWindow::sighandle_accel_quit));
-+
-+ m_ui_manager = Gtk::UIManager::create();
-+ m_ui_manager->insert_action_group(m_action_group);
-+
-+ add_accel_group(m_ui_manager->get_accel_group());
-+
-+ Glib::ustring ui = "<ui>"
-+ "<menubar name='MenuBar'>"
-+ "<menu action='FileMenu'>"
-+ "<menuitem action='Close' />"
-+ "<menuitem action='Quit' />"
-+ "</menu>"
-+ "</menubar>"
-+ "</ui>";
-+ m_ui_manager->add_ui_from_string(ui);
-+
- m_dirty = false;
- }
-
-@@ -98,6 +125,13 @@ void NWindow::show (void) {
- }
-
- /**
-+ * Handles the user pressing Ctrl+Q or Ctrl+W, standard quit buttons.
-+ */
-+void NWindow::sighandle_accel_quit() {
-+ Gtk::Main::quit();
-+}
-+
-+/**
- * Handles the user double clicking on a row in the view.
- */
- void NWindow::sighandle_dblclick_item (const Gtk::TreeModel::Path& path) {
-@@ -443,4 +477,3 @@ void NWindow::sighandle_btn_prefs()
- }
-
- }
--
Index: patches/patch-src_NWindow_h
===================================================================
RCS file: patches/patch-src_NWindow_h
diff -N patches/patch-src_NWindow_h
--- patches/patch-src_NWindow_h 10 Apr 2012 18:23:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_NWindow_h,v 1.1 2012/04/10 18:23:55 jasper Exp $
-
-Added keyboard shortcuts for quitting.
-
-From upstream git commit: d66f9af886692c946b4144271d8cca23483ba489
-
---- src/NWindow.h.orig Tue Apr 10 20:18:26 2012
-+++ src/NWindow.h Tue Apr 10 20:18:33 2012
-@@ -49,6 +49,8 @@ class NWindow : public Gtk::Window {
-
- protected:
-
-+ Glib::RefPtr<Gtk::ActionGroup> m_action_group;
-+ Glib::RefPtr<Gtk::UIManager> m_ui_manager;
- Gtk::VBox main_vbox;
- Gtk::HBox bot_hbox;
-
-@@ -62,6 +64,7 @@ class NWindow : public Gtk::Window {
-
- void setup_select_boxes();
-
-+ void sighandle_accel_quit();
- void sighandle_togb_list_toggled();
- void sighandle_togb_icon_toggled();
- void sighandle_btn_prefs();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/nitrogen/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 15 Jun 2012 08:30:24 -0000 1.4
+++ pkg/PLIST 10 Jun 2017 14:50:21 -0000
@@ -1,31 +1,28 @@
@comment $OpenBSD: PLIST,v 1.4 2012/06/15 08:30:24 ajacoutot Exp $
@bin bin/nitrogen
@man man/man1/nitrogen.1
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
+share/appdata/
+share/appdata/nitrogen.appdata.xml
+share/applications/
+share/applications/nitrogen.desktop
share/icons/hicolor/128x128/apps/nitrogen.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/actions/
share/icons/hicolor/16x16/actions/wallpaper-centered.png
share/icons/hicolor/16x16/actions/wallpaper-scaled.png
share/icons/hicolor/16x16/actions/wallpaper-tiled.png
share/icons/hicolor/16x16/actions/wallpaper-zoomed.png
-share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/nitrogen.png
-share/icons/hicolor/16x16/devices/
share/icons/hicolor/16x16/devices/video-display.png
-share/icons/hicolor/16x16/mimetypes/
share/icons/hicolor/16x16/mimetypes/image-x-generic.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/nitrogen.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/nitrogen.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/nitrogen.png
+share/locale/bs/LC_MESSAGES/nitrogen.mo
+share/locale/fi/LC_MESSAGES/nitrogen.mo
+share/locale/hr/LC_MESSAGES/nitrogen.mo
+share/locale/pl/LC_MESSAGES/nitrogen.mo
+share/locale/ru/LC_MESSAGES/nitrogen.mo
+share/locale/sr/LC_MESSAGES/nitrogen.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
