g_thread_init is deprecated and will be removed in the next glib2 version

which I am currently working on.
While here, regen WANTLIB and merge PLISTs.

ok landry@ (maintainer)
This commit is contained in:
ajacoutot 2013-03-27 07:23:45 +00:00
parent 5d332e2a74
commit 7504dd69fa
4 changed files with 28 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2013/03/21 08:48:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.25 2013/03/27 07:23:45 ajacoutot Exp $
ONLY_FOR_ARCHS =${APM_ARCHS}
@ -8,16 +8,19 @@ DISTNAME = upower-0.9.18
EXTRACT_SUFX = .tar.xz
CATEGORIES = sysutils
SHARED_LIBS += upower-glib 0.0 # 1.1
REVISION = 0
REVISION = 1
HOMEPAGE = http://upower.freedesktop.org/
MASTER_SITES = ${HOMEPAGE}/releases/
MAINTAINER = Landry Breuil <landry@openbsd.org>
#GPLv2+
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 m polkit-gobject-1
WANTLIB += pthread
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-gtk-doc \
@ -48,7 +51,4 @@ LIB_DEPENDS = sysutils/polkit>=0.101 \
BUILD_DEPENDS = devel/gobject-introspection \
textproc/docbook-xsl
WANTLIB += c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 gthread-2.0
WANTLIB += m polkit-gobject-1 pthread
.include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_openbsd_up-backend_c,v 1.7 2013/03/27 07:23:45 ajacoutot Exp $
--- src/openbsd/up-backend.c.orig Wed Mar 27 07:53:00 2013
+++ src/openbsd/up-backend.c Wed Mar 27 07:54:28 2013
@@ -556,7 +556,6 @@ up_backend_init (UpBackend *backend)
device_class->get_low_battery = up_apm_device_get_low_battery;
device_class->get_online = up_apm_device_get_online;
device_class->refresh = up_apm_device_refresh;
- g_thread_init (NULL);
/* creates thread */
if((backend->priv->apm_thread = (GThread*) g_thread_create((GThreadFunc)up_backend_apm_event_thread, (void*) backend, FALSE, &err) == NULL))
{

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/05/23 19:04:57 landry Exp $
@lib lib/libupower-glib.so.${LIBupower-glib_VERSION}

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2012/01/03 21:50:06 landry Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.6 2013/03/27 07:23:45 ajacoutot Exp $
@bin bin/upower
include/libupower-glib/
include/libupower-glib/up-client.h
@ -16,6 +15,7 @@ lib/girepository-1.0/
lib/girepository-1.0/UPowerGlib-1.0.typelib
lib/libupower-glib.a
lib/libupower-glib.la
@lib lib/libupower-glib.so.${LIBupower-glib_VERSION}
lib/pkgconfig/
lib/pkgconfig/upower-glib.pc
@bin libexec/upowerd
@ -46,9 +46,18 @@ share/examples/upower/dbus-1/system.d/org.freedesktop.UPower.conf
@sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.UPower.conf
share/gir-1.0/
share/gir-1.0/UPowerGlib-1.0.gir
share/locale/
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/upower.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/upower.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/upower.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/upower.mo
share/polkit-1/
share/polkit-1/actions/