Update to upower 0.9.11, remove patches merged upstream, add a patch
from jasper@ to fix an implicit declaration warning (pushed upstream)
This commit is contained in:
landry
parent
ef7d5a7201
commit
78cde93ac6
@ -1,15 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2011/05/24 16:02:39 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2011/05/30 07:48:53 landry Exp $
|
||||
|
||||
ONLY_FOR_ARCHS =${APM_ARCHS}
|
||||
|
||||
COMMENT = userland power management interface
|
||||
|
||||
DISTNAME = upower-0.9.10
|
||||
DISTNAME = upower-0.9.11
|
||||
CATEGORIES = sysutils
|
||||
SHARED_LIBS += upower-glib 0.0 # 1.1
|
||||
|
||||
REVISION = 0
|
||||
|
||||
HOMEPAGE = http://upower.freedesktop.org/
|
||||
MASTER_SITES = ${HOMEPAGE}/releases/
|
||||
|
||||
@ -49,7 +47,4 @@ WANTLIB = c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 m \
|
||||
polkit-gobject-1 pthread gthread-2.0 gio-2.0 \
|
||||
gmodule-2.0 pcre z
|
||||
|
||||
post-extract:
|
||||
cp ${FILESDIR}/up-apm-native.h ${WRKSRC}/src/openbsd
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (upower-0.9.10.tar.gz) = K18+M6wyIj4nxQUQ+q1znw==
|
||||
RMD160 (upower-0.9.10.tar.gz) = xs6d1F49Q/gZh9hNNrZ6O8mFX4g=
|
||||
SHA1 (upower-0.9.10.tar.gz) = cb9p6sDWfq5P1Lbcn/nraRj4QSE=
|
||||
SHA256 (upower-0.9.10.tar.gz) = e+Tf3gTb/4lEGcZuusB6QfoGXqMBnsx2YUIi5mI82/k=
|
||||
SIZE (upower-0.9.10.tar.gz) = 631469
|
||||
MD5 (upower-0.9.11.tar.gz) = jnvLM1cNGk7cXDsNrz/lrg==
|
||||
RMD160 (upower-0.9.11.tar.gz) = rSQx4Op5HaMHaE5rV2B+HldXOQk=
|
||||
SHA1 (upower-0.9.11.tar.gz) = 3c9xFBchv52j1kVQpXjHOar+16M=
|
||||
SHA256 (upower-0.9.11.tar.gz) = XCzSJFJ9jTKiPYAoZLmtgMQHAooH50MpwF2jbepBBOo=
|
||||
SIZE (upower-0.9.11.tar.gz) = 634855
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
||||
*
|
||||
* Copyright (C) 2011 Landry Breuil <landry@openbsd.org>
|
||||
*
|
||||
* Licensed under the GNU General Public License Version 2
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef __UP_APM_NATIVE_H__
|
||||
#define __UP_APM_NATIVE_H__
|
||||
|
||||
/* os-specific headers */
|
||||
#include <errno.h> /* errno */
|
||||
#include <fcntl.h> /* open() */
|
||||
/* kevent() */
|
||||
#include <sys/types.h>
|
||||
#include <sys/event.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/ioctl.h> /* ioctl() */
|
||||
/* APM macros */
|
||||
|
||||
#include <machine/apmvar.h>
|
||||
|
||||
/* sensor struct defs */
|
||||
#include <sys/sensors.h>
|
||||
|
||||
/* sysctl() */
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define UP_TYPE_APM_NATIVE (up_apm_native_get_type ())
|
||||
#define UP_APM_NATIVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_APM_NATIVE, UpApmNative))
|
||||
#define UP_APM_NATIVE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYPE_APM_NATIVE, UpApmNativeClass))
|
||||
#define UP_IS_APM_NATIVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_APM_NATIVE))
|
||||
#define UP_IS_APM_NATIVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_APM_NATIVE))
|
||||
#define UP_APM_NATIVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_APM_NATIVE, UpApmNativeClass))
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GObject parent;
|
||||
gchar* path;
|
||||
} UpApmNative;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GObjectClass parent_class;
|
||||
} UpApmNativeClass;
|
||||
|
||||
|
||||
// XX in .c ?
|
||||
//GType up_apm_native_get_type (void);
|
||||
//G_DEFINE_TYPE (UpApmNative, up_apm_native, G_TYPE_OBJECT)
|
||||
|
||||
UpApmNative* up_apm_native_new (const char*);
|
||||
const gchar * up_apm_native_get_path(UpApmNative*);
|
||||
gboolean up_native_is_laptop();
|
||||
gboolean up_native_get_sensordev(const char*, struct sensordev*);
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2011/05/23 19:04:57 landry Exp $
|
||||
--- configure.orig Mon Mar 21 19:42:08 2011
|
||||
+++ configure Sat May 21 13:07:51 2011
|
||||
@@ -14138,10 +14138,6 @@ else
|
||||
$OpenBSD: patch-configure,v 1.2 2011/05/30 07:48:53 landry Exp $
|
||||
--- configure.orig Wed May 4 18:50:00 2011
|
||||
+++ configure Mon May 30 09:43:16 2011
|
||||
@@ -14131,10 +14131,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2011/05/23 19:04:57 landry Exp $
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2011/05/30 07:48:53 landry Exp $
|
||||
no need for var/lib/upower
|
||||
--- src/Makefile.in.orig Tue Apr 26 14:41:41 2011
|
||||
+++ src/Makefile.in Sat May 21 13:07:51 2011
|
||||
@@ -1542,9 +1542,6 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile
|
||||
--- src/Makefile.in.orig Wed May 4 18:49:59 2011
|
||||
+++ src/Makefile.in Mon May 30 09:43:16 2011
|
||||
@@ -1543,9 +1543,6 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile
|
||||
cp $< $@
|
||||
|
||||
install-data-hook:
|
||||
|
||||
12
sysutils/upower/patches/patch-src_openbsd_up-apm-native_h
Normal file
12
sysutils/upower/patches/patch-src_openbsd_up-apm-native_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_openbsd_up-apm-native_h,v 1.1 2011/05/30 07:48:53 landry Exp $
|
||||
--- src/openbsd/up-apm-native.h.orig Mon May 30 09:43:40 2011
|
||||
+++ src/openbsd/up-apm-native.h Mon May 30 09:44:03 2011
|
||||
@@ -25,6 +25,8 @@
|
||||
/* os-specific headers */
|
||||
#include <errno.h> /* errno */
|
||||
#include <fcntl.h> /* open() */
|
||||
+#include <unistd.h> /* close() */
|
||||
+#include <string.h> /* strcmp() */
|
||||
/* kevent() */
|
||||
#include <sys/types.h>
|
||||
#include <sys/event.h>
|
||||
@ -1,31 +0,0 @@
|
||||
$OpenBSD: patch-src_up-main_c,v 1.1.1.1 2011/05/23 19:04:57 landry Exp $
|
||||
glib-unix.h and g_unix_signal_add_watch_full appeared in glib 2.29.5
|
||||
--- src/up-main.c.orig Sun May 22 22:35:09 2011
|
||||
+++ src/up-main.c Sun May 22 22:35:14 2011
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "up-kbd-backlight.h"
|
||||
#include "up-wakeups.h"
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,28,7)
|
||||
+#if GLIB_CHECK_VERSION(2,29,5)
|
||||
#include <glib-unix.h>
|
||||
#endif
|
||||
|
||||
@@ -92,7 +92,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,28,7)
|
||||
+#if GLIB_CHECK_VERSION(2,29,5)
|
||||
|
||||
/**
|
||||
* up_main_sigint_cb:
|
||||
@@ -201,7 +201,7 @@ main (gint argc, gchar **argv)
|
||||
goto out;
|
||||
}
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,28,7)
|
||||
+#if GLIB_CHECK_VERSION(2,29,5)
|
||||
/* do stuff on ctrl-c */
|
||||
g_unix_signal_add_watch_full (SIGINT,
|
||||
G_PRIORITY_DEFAULT,
|
||||
Loading…
x
Reference in New Issue
Block a user