cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to simple-scan-3.10.0.

Browse Source
This commit is contained in:
ajacoutot 2013-09-26 08:50:48 +00:00
parent fed2bc5a11
commit 2115d87689
5 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/simple-scan/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.30 2013/09/24 09:19:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2013/09/26 08:50:48 ajacoutot Exp $
COMMENT= simple scanning utility
GNOME_PROJECT= simple-scan
GNOME_VERSION= 3.8.0
GNOME_VERSION= 3.10.0
CATEGORIES= graphics
@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += atk-1.0 c cairo cairo-gobject colord colordprivate
WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 jpeg m pango-1.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread sane sqlite3 z
MASTER_SITES= https://launchpad.net/simple-scan/${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${GNOME_VERSION}/+download/

4
graphics/simple-scan/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (simple-scan-3.8.0.tar.xz) = jfceX55dtcUyF8tWsOI7WN/mW8F06HOtPuV2++zK3CI=
SIZE (simple-scan-3.8.0.tar.xz) = 335972
SHA256 (simple-scan-3.10.0.tar.xz) = JzJkH6d8ddzUcAjMQIZPeEe5PVsnKR3tb0IzKJ9dEPI=
SIZE (simple-scan-3.10.0.tar.xz) = 438068

8
graphics/simple-scan/patches/patch-configure_ac
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.2 2013/09/24 09:19:37 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.3 2013/09/26 08:50:48 ajacoutot Exp $
No gudev under OpenBSD.
--- configure.ac.orig Tue Mar 26 03:06:09 2013
+++ configure.ac Tue Sep 24 10:52:09 2013
@@ -27,7 +27,6 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
--- configure.ac.orig Wed Sep 25 07:40:41 2013
+++ configure.ac Thu Sep 26 10:28:39 2013
@@ -28,7 +28,6 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
zlib
cairo
gdk-pixbuf-2.0

68
graphics/simple-scan/patches/patch-src_simple-scan_c
View File

@ -1,9 +1,6 @@
$OpenBSD: patch-src_simple-scan_c,v 1.6 2013/09/24 09:19:37 ajacoutot Exp $
No gudev under OpenBSD.
--- src/simple-scan.c.orig Thu Mar 21 04:33:34 2013
+++ src/simple-scan.c Tue Sep 24 10:43:42 2013
$OpenBSD: patch-src_simple-scan_c,v 1.7 2013/09/26 08:50:48 ajacoutot Exp $
--- src/simple-scan.c.orig Thu Sep 26 10:29:05 2013
+++ src/simple-scan.c Thu Sep 26 10:38:12 2013
@@ -15,7 +15,9 @@
#include <glib.h>
#include <glib-object.h>
@ -35,19 +32,21 @@ No gudev under OpenBSD.
void user_interface_set_scan_devices (UserInterface* self, GList* devices);
void user_interface_set_selected_device (UserInterface* self, const gchar* device);
static void _scan_device_unref0_ (gpointer var);
@@ -486,9 +492,11 @@ static void _simple_scan_scanner_scanning_changed_cb_s
@@ -521,11 +527,13 @@ static void _simple_scan_scanner_scanning_changed_cb_s
}
+#ifndef __OpenBSD__
static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
simple_scan_on_uevent (self, _sender, action, device);
#line 528 "simple-scan.c"
}
+#endif
static void _scan_device_unref0_ (gpointer var) {
@@ -527,8 +535,10 @@ static void simple_scan_real_startup (GApplication* ba
@@ -569,8 +577,10 @@ static void simple_scan_real_startup (GApplication* ba
gint _subsystems_size_;
gchar** _tmp18_;
gint _tmp18__length1;
@ -56,66 +55,61 @@ No gudev under OpenBSD.
GUdevClient* _tmp20_;
+#endif
ScanDevice* _tmp21_;
#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self = (SimpleScan*) base;
G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
@@ -575,11 +585,13 @@ static void simple_scan_real_startup (GApplication* ba
_subsystems_size_ = subsystems_length1;
@@ -662,6 +672,7 @@ static void simple_scan_real_startup (GApplication* ba
_tmp18_ = subsystems;
#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp18__length1 = subsystems_length1;
+#ifndef __OpenBSD__
#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp19_ = g_udev_client_new (_tmp18_);
_g_object_unref0 (self->priv->udev_client);
self->priv->udev_client = _tmp19_;
#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -672,6 +683,7 @@ static void simple_scan_real_startup (GApplication* ba
_tmp20_ = self->priv->udev_client;
#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
g_signal_connect_object (_tmp20_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
+#endif
#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp21_ = self->priv->default_device;
if (_tmp21_ != NULL) {
GList* device_list;
@@ -629,8 +641,10 @@ static void simple_scan_real_shutdown (GApplication* b
self->priv->book = NULL;
#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -752,10 +764,12 @@ static void simple_scan_real_shutdown (GApplication* b
_user_interface_unref0 (self->priv->ui);
#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self->priv->ui = NULL;
+#ifndef __OpenBSD__
#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (self->priv->udev_client);
#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
self->priv->udev_client = NULL;
+#endif
#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_tmp0_ = self->priv->scanner;
scanner_free (_tmp0_);
}
@@ -1742,6 +1756,7 @@ static void simple_scan_log_cb (const gchar* log_domai
#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2596,6 +2610,7 @@ static void simple_scan_log_cb (const gchar* log_domai
}
+#ifndef __OpenBSD__
static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device) {
Scanner* _tmp0_;
g_return_if_fail (self != NULL);
@@ -1751,6 +1766,7 @@ static void simple_scan_on_uevent (SimpleScan* self, G
_tmp0_ = self->priv->scanner;
#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2612,6 +2627,7 @@ static void simple_scan_on_uevent (SimpleScan* self, G
scanner_redetect (_tmp0_);
#line 2613 "simple-scan.c"
}
+#endif
static glong string_strnlen (gchar* str, glong maxlen) {
@@ -2373,7 +2389,9 @@ gint simple_scan_main (gchar** args, int args_length1)
const gchar* _tmp37_;
gchar* _tmp38_;
_tmp30_ = scan_device_new ();
+#ifndef __OpenBSD__
_scan_device_unref0 (device);
+#endif
device = _tmp30_;
_tmp31_ = device;
_tmp32_ = args;
@@ -2450,7 +2468,9 @@ static void simple_scan_finalize (GObject* obj) {
SimpleScan * self;
@@ -3763,8 +3779,10 @@ static void simple_scan_finalize (GObject* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SIMPLE_SCAN, SimpleScan);
#line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_scan_device_unref0 (self->priv->default_device);
+#ifndef __OpenBSD__
#line 34 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_g_object_unref0 (self->priv->udev_client);
+#endif
#line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
_user_interface_unref0 (self->priv->ui);
_scanner_unref0 (self->priv->scanner);
_book_unref0 (self->priv->book);
#line 36 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"

35
graphics/simple-scan/pkg/PLIST
View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2012/05/28 08:51:45 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2013/09/26 08:50:48 ajacoutot Exp $
@bin bin/simple-scan
@man man/man1/simple-scan.1
share/appdata/
share/appdata/simple-scan.appdata.xml
share/applications/simple-scan.desktop
share/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
share/help/
@ -35,8 +37,13 @@ share/help/de/simple-scan/scanning.page
share/locale/af/LC_MESSAGES/simple-scan.mo
share/locale/ar/LC_MESSAGES/simple-scan.mo
share/locale/ast/LC_MESSAGES/simple-scan.mo
share/locale/az/LC_MESSAGES/simple-scan.mo
share/locale/bg/LC_MESSAGES/simple-scan.mo
share/locale/bo/
share/locale/bo/LC_MESSAGES/
share/locale/bo/LC_MESSAGES/simple-scan.mo
share/locale/ca/LC_MESSAGES/simple-scan.mo
share/locale/ca@valencia/LC_MESSAGES/simple-scan.mo
share/locale/cs/LC_MESSAGES/simple-scan.mo
share/locale/da/LC_MESSAGES/simple-scan.mo
share/locale/de/LC_MESSAGES/simple-scan.mo
@ -48,23 +55,47 @@ share/locale/et/LC_MESSAGES/simple-scan.mo
share/locale/eu/LC_MESSAGES/simple-scan.mo
share/locale/fi/LC_MESSAGES/simple-scan.mo
share/locale/fr/LC_MESSAGES/simple-scan.mo
share/locale/gd/
share/locale/gd/LC_MESSAGES/
share/locale/gd/LC_MESSAGES/simple-scan.mo
share/locale/gl/LC_MESSAGES/simple-scan.mo
share/locale/he/LC_MESSAGES/simple-scan.mo
share/locale/hr/LC_MESSAGES/simple-scan.mo
share/locale/hu/LC_MESSAGES/simple-scan.mo
share/locale/hy/LC_MESSAGES/simple-scan.mo
share/locale/id/LC_MESSAGES/simple-scan.mo
share/locale/it/LC_MESSAGES/simple-scan.mo
share/locale/ja/LC_MESSAGES/simple-scan.mo
share/locale/kk/LC_MESSAGES/simple-scan.mo
share/locale/km/LC_MESSAGES/simple-scan.mo
share/locale/ky/LC_MESSAGES/simple-scan.mo
share/locale/lt/LC_MESSAGES/simple-scan.mo
share/locale/lv/LC_MESSAGES/simple-scan.mo
share/locale/mhr/
share/locale/mhr/LC_MESSAGES/
share/locale/mhr/LC_MESSAGES/simple-scan.mo
share/locale/ms/LC_MESSAGES/simple-scan.mo
share/locale/my/
share/locale/my/LC_MESSAGES/
share/locale/my/LC_MESSAGES/simple-scan.mo
share/locale/nb/LC_MESSAGES/simple-scan.mo
share/locale/nl/LC_MESSAGES/simple-scan.mo
share/locale/oc/LC_MESSAGES/simple-scan.mo
share/locale/pa/LC_MESSAGES/simple-scan.mo
share/locale/pl/LC_MESSAGES/simple-scan.mo
share/locale/pt/LC_MESSAGES/simple-scan.mo
share/locale/pt_BR/LC_MESSAGES/simple-scan.mo
share/locale/ro/LC_MESSAGES/simple-scan.mo
share/locale/ru/LC_MESSAGES/simple-scan.mo
share/locale/sd/
share/locale/sd/LC_MESSAGES/
share/locale/sd/LC_MESSAGES/simple-scan.mo
share/locale/se/
share/locale/se/LC_MESSAGES/
share/locale/se/LC_MESSAGES/simple-scan.mo
share/locale/shn/
share/locale/shn/LC_MESSAGES/
share/locale/shn/LC_MESSAGES/simple-scan.mo
share/locale/sk/LC_MESSAGES/simple-scan.mo
share/locale/sl/LC_MESSAGES/simple-scan.mo
share/locale/sq/LC_MESSAGES/simple-scan.mo
@ -78,6 +109,7 @@ share/locale/uk/LC_MESSAGES/simple-scan.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/simple-scan.mo
share/locale/uz/LC_MESSAGES/simple-scan.mo
share/locale/vi/LC_MESSAGES/simple-scan.mo
share/locale/zh_CN/LC_MESSAGES/simple-scan.mo
share/locale/zh_TW/LC_MESSAGES/simple-scan.mo
@ -102,7 +134,6 @@ share/simple-scan/icons/hicolor/48x48/actions/object-crop.png
share/simple-scan/icons/hicolor/scalable/
share/simple-scan/icons/hicolor/scalable/actions/
share/simple-scan/icons/hicolor/scalable/actions/object-crop.svg
share/simple-scan/simple-scan.ui
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/update-desktop-database