Drop uneeded patches.

This commit is contained in:
ajacoutot 2013-06-28 10:11:10 +00:00
parent 968f98664e
commit 9f0cfe95ff
6 changed files with 15 additions and 81 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2013/04/08 14:20:34 jasper Exp $
# $OpenBSD: Makefile,v 1.35 2013/06/28 10:11:10 ajacoutot Exp $
COMMENT= reminder program for prevention of RSI
DISTNAME= workrave-1.9.4
REVISION= 4
REVISION= 5
CATEGORIES= productivity x11
HOMEPAGE= http://www.workrave.org/
@ -11,15 +11,15 @@ HOMEPAGE= http://www.workrave.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xxf86vm
WANTLIB += atk-1.0 atkmm-1.6 c cairo cairomm-1.0 dbus-1 dbus-glib-1
WANTLIB += drm expat ffi fontconfig freetype gconf-2 gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0
WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 gstreamer-0.10 gthread-2.0
WANTLIB += gtk-x11-2.0 gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs
WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm xml2 z
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xtst atk-1.0 atkmm-1.6 c cairo
WANTLIB += cairomm-1.0 dbus-1 dbus-glib-1 expat ffi fontconfig
WANTLIB += freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gstreamer-0.10 gthread-2.0 gtk-x11-2.0 gtkmm-2.4
WANTLIB += harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
WANTLIB += pcre pixman-1 png pthread pthread-stubs sigc-2.0 stdc++
WANTLIB += xcb xcb-render xcb-shm xml2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/}
@ -27,7 +27,7 @@ BUILD_DEPENDS= devel/py-cheetah
LIB_DEPENDS= devel/gconf2 \
multimedia/gstreamer-0.10/core \
x11/dbus-glib \
x11/gtk2mm
x11/gtk2mm>=2.24.4
MODULES= devel/gettext \
lang/python \

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-frontend_gtkmm_src_GUI_cc,v 1.1 2013/04/08 14:20:34 jasper Exp $
Fix build with gtkmm>=2.24.3
--- frontend/gtkmm/src/GUI.cc.orig Mon Apr 8 16:13:15 2013
+++ frontend/gtkmm/src/GUI.cc Mon Apr 8 16:15:28 2013
@@ -25,6 +25,10 @@
#include "nls.h"
#include "debug.hh"
+#include <glibmm/value.h>
+#include <glibmm/arrayhandle.h>
+#include <glibmm/listhandle.h>
+#include <glibmm/optioncontext.h>
#include <gtkmm/main.h>
#include <gtkmm/messagedialog.h>
#include <glibmm/optiongroup.h>

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-frontend_gtkmm_src_HeadInfo_hh,v 1.1 2013/04/08 14:20:34 jasper Exp $
Fix build with gtkmm>=2.24.3
--- frontend/gtkmm/src/HeadInfo.hh.orig Mon Apr 8 16:16:06 2013
+++ frontend/gtkmm/src/HeadInfo.hh Mon Apr 8 16:16:49 2013
@@ -30,6 +30,8 @@
#undef max
#endif
+#include <glibmm/value.h>
+#include <glibmm/listhandle.h>
#include <gdkmm/rectangle.h>
#include <gdkmm/display.h>
#include <gdkmm/screen.h>

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2013/04/08 14:36:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2013/06/28 10:12:54 ajacoutot Exp $
COMMENT= graphical hard drive inspection tool (smartctl front-end)
DISTNAME= gsmartcontrol-0.8.6
EXTRACT_SUFX= .tar.bz2
REVISION= 4
REVISION= 5
CATEGORIES= sysutils x11
@ -26,7 +26,7 @@ MODULES= devel/gettext
RUN_DEPENDS= devel/desktop-file-utils \
sysutils/smartmontools \
x11/gtk+2,-guic
LIB_DEPENDS= x11/gtk2mm
LIB_DEPENDS= x11/gtk2mm>=2.24.4
CONFIGURE_STYLE= gnu

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_applib_cmdex_sync_gui_cpp,v 1.1 2013/04/08 14:36:23 ajacoutot Exp $
Fix build with gtkmm>=2.24.3
--- src/applib/cmdex_sync_gui.cpp.orig Mon Apr 8 16:02:27 2013
+++ src/applib/cmdex_sync_gui.cpp Mon Apr 8 16:03:03 2013
@@ -4,6 +4,10 @@
License: See LICENSE_gsmartcontrol.txt
***************************************************************************/
+#include <glibmm/value.h>
+#include <glibmm/arrayhandle.h>
+#include <glibmm/listhandle.h>
+#include <glibmm/optioncontext.h>
#include <gtkmm/main.h> // Gtk::Main
#include "hz/fs_path.h"

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_gsc_init_cpp,v 1.1 2013/04/08 14:36:23 ajacoutot Exp $
Fix build with gtkmm>=2.24.3
--- src/gsc_init.cpp.orig Mon Apr 8 16:28:56 2013
+++ src/gsc_init.cpp Mon Apr 8 16:30:06 2013
@@ -10,6 +10,10 @@
#include <cstdio> // std::printf
#include <vector>
#include <sstream>
+#include <glibmm/value.h>
+#include <glibmm/arrayhandle.h>
+#include <glibmm/listhandle.h>
+#include <glibmm/optioncontext.h>
#include <gtkmm/main.h>
#include <gtkmm/messagedialog.h>
#include <gtk/gtk.h> // gtk_window_set_default_icon_name, gtk_icon_theme_*