Commit dee57f8c authored by Luca Giambonini's avatar Luca Giambonini

glib2 group update (part 1)

parent 250ee974
#
# Platform Packages for Chakra, part of chakra-project.org
# Platform Packages for Chakra, part of chakraos.org
#
# maintainer abveritas@chakra-project.org
# contributor Ionut Biru <ibiru@archlinux.org>
# maintainer almack <gluca86 at gmail dot com>
pkgname=at-spi2-core
pkgver=2.11.5
pkgrel=2
pkgver=2.14.1
pkgrel=1
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
arch=('x86_64')
url="http://www.gnome.org"
......@@ -14,7 +13,7 @@ license=('GPL2')
depends=('dbus-core' 'glib2' 'libxtst')
makedepends=('intltool' 'gobject-introspection')
source=("http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
md5sums=('d61793f50af00cd5d9262c2d12d40ac6')
md5sums=('a37993cc50d90465c9aeed95e2ac439a')
build() {
cd $pkgname-$pkgver
......@@ -31,4 +30,3 @@ package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
......@@ -4,8 +4,8 @@
# maintainer abveritas@chakra-project.org
pkgname=atk
pkgver=2.11.6
pkgrel=2
pkgver=2.14.0
pkgrel=1
pkgdesc="A library providing a set of interfaces for accessibility"
arch=('x86_64')
license=('LGPL')
......@@ -13,7 +13,7 @@ depends=('glib2')
makedepends=('gobject-introspection')
source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
url='http://www.gtk.org/'
md5sums=('fdf709e19eee2e22f206f906eeb3c2da')
md5sums=('ecb7ca8469a5650581b1227d78051b8b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -4,7 +4,7 @@
pkgname=bumblebee
pkgver=3.2.1
pkgrel=6
pkgrel=7
pkgdesc="Bumblebee brings Optimus Support for Linux Through VirtualGL."
arch=('x86_64')
depends=('virtualgl' 'glib2' 'mesa-libgl')
......
......@@ -2,7 +2,7 @@
pkgname=cairo
pkgver=1.12.16
pkgrel=4
pkgrel=5
_ubuntu_diff_version=${pkgver}-0ubuntu2
pkgdesc="Cairo vector graphics library"
arch=('x86_64')
......
......@@ -3,8 +3,8 @@
# Maintainer: BrLi <rainman59118[at]gmail.com>
pkgname=cdemu-client
pkgver=2.1.1
pkgrel=3
pkgver=3.0.0
pkgrel=1
pkgdesc="Simple command-line client for controlling cdemu-daemon"
arch=('x86_64')
url=("http://cdemu.sourceforge.net/")
......@@ -12,7 +12,7 @@ license=('GPL')
depends=('python2' 'dbus-python' 'cdemu-daemon')
makedepends=('intltool' 'cmake')
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2")
md5sums=('e3062659481b804d12fac58ad64316a0')
md5sums=('4e188ec42b1db005ed96b81db52a20ed')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
......
......@@ -7,46 +7,48 @@
# Maintainer: BrLi <rainman59118[at]Gmail.com>
pkgname=cdemu-daemon
pkgver=2.1.1
pkgrel=3
pkgver=3.0.2
pkgrel=1
pkgdesc=("CD/DVD-ROM device emulator daemon")
arch=('x86_64')
backup=('etc/conf.d/cdemu-daemon'
'etc/dbus-1/system.d/cdemu-daemon-dbus.conf')
url="http://cdemu.sourceforge.net/"
license=('GPL')
depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao')
depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage>=$pkgver" 'libao')
makedepends=('cmake')
optdepends=('alsa-lib: to enable the ALSA audio driver'
'pulseaudio: to enable the PA audio driver')
install=$pkgname.install
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
'cdemu-daemon.conf')
md5sums=('a0ede84ba3278d2886358b4f3fec5e18'
'109d1eb46eb2943e511715611907d1e9')
'system-arch.patch')
md5sums=('ada2ec2ff2e1bbbc10c596414b4ba77d'
'fd50ba1c66c95337044db494fba887c4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
prepare() {
mkdir build
cd $pkgname-$pkgver
# Patch system daemon for Arch-friendlyness
# It's disabled by default. Should we even ship it?
patch -Np1 -i ../system-arch.patch
}
build() {
cd build
cmake .. \
cmake ../$pkgname-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname
-DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/lib/modules-load.d"
echo "vhba" > "${pkgdir}/usr/lib/modules-load.d/cdemu.conf"
cd ../..
# Chakra settings
install -Dm644 "${srcdir}/cdemu-daemon.conf" "${pkgdir}/etc/conf.d/cdemu-daemon"
}
cd build
make DESTDIR="$pkgdir" install
install -d "$pkgdir/usr/lib/modules-load.d"
echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
}
\ No newline at end of file
# how many optical drives to emulate
NUM_DEVICES=2
# audio backend (null, alsa or pulse)
AUDIO_DRIVER=pulse
post_install () {
cat <<MSG
> The daemons are started on-demand.
> See /etc/conf.d/cdemu-daemon for further configuration.
> Only users with at a physical terminal or in the 'cdemu'
group can communicate with the system daemon or make use
of a session daemon.
> Only users at the console or in the 'cdemu' group can
communicate with the system daemon or use a session
daemon.
> If you want to output CD-Audio you need to use a session
daemon, e.g. via "cdemu -b session". If you use ALSA and
not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon
> The daemons are usually started on-demand, but a system
daemon can be manually started via cdemu-daemon.service.
See /etc/conf.d/cdemu-daemon for further configuration.
> If you want to output CD-Audio, write AUDIO_DRIVER=pulse or
AUDIO_DRIVER=alsa to ~/.cdemu-daemon and use "cdemu -b session"
to control a session daemon.
MSG
getent group cdemu >/dev/null 2>&1 || groupadd -g 103 cdemu &>/dev/null
post_upgrade $1 $1
modprobe vhba
return 0
}
post_upgrade () {
cat <<MSG
> Configuration files have been renamed according to upstream. This affects:
if (( $(vercmp $2 2.0.0) < 0)); then
cat <<MSG
> Configuration files and log files have been renamed in
order to bring Chakra closer to upstream. In particular,
this affects:
/etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon
/var/log/cdemud.log --> /var/log/cdemu-daemon.log
~/.cdemud --> ~/.cdemu-daemon
~/.cdemud.log --> ~/.cdemu-daemon.log
Please move your configuration.
MSG
getent group cdemu >/dev/null 2>&1 || groupadd -g 103 cdemu &>/dev/null
MSG
fi
return 0
}
post_remove () {
if getent group cdemu >/dev/null 2>&1; then
groupdel cdemu
fi
}
# vim:set ts=2 sw=2 et:
diff -u -rN cdemu-daemon-2.1.0/CMakeLists.txt cdemu-daemon-2.1.0-arch/CMakeLists.txt
--- cdemu-daemon-2.1.0/CMakeLists.txt 2013-06-07 21:33:53.000000000 +0200
+++ cdemu-daemon-2.1.0-arch/CMakeLists.txt 2013-06-08 02:20:15.948655947 +0200
@@ -18,7 +18,7 @@
include (FileList)
# Options
-option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" off)
+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" on)
option (SESSION_BUS_SERVICE "Install CDEmu daemon as D-Bus session bus service" on)
# If install prefix is /usr, override the sysconf dir to be /etc instead of /usr/etc
@@ -46,6 +46,10 @@
${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
)
+configure_file (
+ ${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
+ ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
+)
# Global definitions
add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99
@@ -104,6 +108,10 @@
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
)
install (
+ FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
+ )
+ install (
FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
)
@@ -111,5 +119,10 @@
FILES system/cdemu-daemon-dbus.conf
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
)
+ install (
+ FILES system/cdemu-daemon.conf
+ RENAME cdemu-daemon
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
+ )
endif ()
diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf
--- cdemu-daemon-2.1.0/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100
+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf 2013-06-08 02:12:19.032035389 +0200
@@ -0,0 +1,8 @@
+# how many optical drives to emulate
+#NUM_DEVICES=1
+
+# audio backend (null, default, alsa, or pulse)
+#AUDIO_DRIVER=null
+
+# log file
+#LOG_FILE=/var/log/cdemu-daemon.log
diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf
--- cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf 2013-06-07 21:33:53.000000000 +0200
+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf 2013-06-08 02:11:52.922220389 +0200
@@ -11,8 +11,13 @@
<allow own="net.sf.cdemu.CDEmuDaemon"/>
</policy>
- <!-- Allow anyone to invoke methods on the interface -->
- <policy context="default">
+ <!-- Allow users at the console to invoke methods on the interface -->
+ <policy at_console="true">
+ <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
+ </policy>
+
+ <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
+ <policy group="cdemu">
<allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
</policy>
</busconfig>
diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.service.in cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in
--- cdemu-daemon-2.1.0/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100
+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in 2013-06-08 02:13:08.331686074 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CDEmu Daemon
+
+[Service]
+Type=dbus
+BusName=net.sf.cdemu.CDEmuDaemon
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
+
+[Install]
+WantedBy=multi-user.target
diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh
--- cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh 2013-06-07 21:33:53.000000000 +0200
+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh 2013-06-08 02:11:53.152218760 +0200
@@ -1,15 +1,15 @@
#!/bin/sh
# Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
# configuration (number of devices, audio driver, log file) are read
-# from /etc/sysconfig/cdemu-daemon
+# from /etc/conf.d/cdemu-daemon
# Default settings
NUM_DEVICES=1
AUDIO_DRIVER=null
-LOG_FILE=/tmp/cdemu-daemon.log
+LOG_FILE=/var/log/cdemu-daemon.log
# Read the settings
-CONFIG_FILE=/etc/sysconfig/cdemu-daemon
+CONFIG_FILE=/etc/conf.d/cdemu-daemon
if [ -f ${CONFIG_FILE} ]; then
. ${CONFIG_FILE};
diff -u -rN cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
--- cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-07 21:33:53.000000000 +0200
+++ cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-08 02:14:26.824463231 +0200
@@ -2,4 +2,4 @@
Name=net.sf.cdemu.CdemuDaemon
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
User=root
-
+SystemdService=cdemu-daemon.service
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=eggdbus
pkgver=0.6
pkgrel=5
pkgdesc="Experimental D-Bus bindings for GObject"
arch=('x86_64')
license=('LGPL')
url="http://www.freedesktop.org/wiki/Software/Policykit"
depends=('glib2' 'dbus-glib')
source=("http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz")
md5sums=('b43d2a6c523fcb8b9d0b0300c4222386')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --disable-static
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas@chakra-project.org
# maintainer almack
pkgname=gdk-pixbuf2
pkgver=2.30.4
pkgrel=2
pkgver=2.31.2
pkgrel=1
pkgdesc="An image loading library"
arch=('x86_64')
url="http://www.gtk.org/"
......@@ -13,7 +13,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
makedepends=('gobject-introspection')
install=gdk-pixbuf2.install
source=("http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz")
sha1sums=('1f92ef9246ed70003cbb104128c0d24720830d53')
sha1sums=('a7a451e61d47056a94753c300431ab78e2068983')
build() {
cd "${srcdir}/gdk-pixbuf-${pkgver}"
......
# Maintainer: Bruce Liu <brli@users.sourceforge.net>
pkgname=glib-perl
pkgver=1.304
pkgrel=2
pkgver=1.305
pkgrel=1
pkgdesc="Perl wrappers for glib 2.x, including GObject"
arch=('x86_64')
license=('LGPL')
......@@ -11,7 +11,7 @@ options=('!emptydirs')
depends=('glib2' 'perl')
makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
source=("http://sourceforge.net/projects/gtk2-perl/files/Glib/${pkgver}/Glib-${pkgver}.tar.gz")
md5sums=('62e454da4eb8eccdb59452c8bfd8565c')
md5sums=('75a5d3a93fa8ec8e804a344a2a65507f')
build() {
cd "${srcdir}/Glib-${pkgver}"
......
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas@chakra-project.org
# maintainer almack
pkgbase=glibmm
pkgname=('glibmm' 'glibmm-docs')
pkgver=2.38.1
pkgrel=2
pkgver=2.42.0
pkgrel=1
arch=('x86_64')
license=('LGPL')
makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
makedepends=('glib2' 'libsigc++' 'pkgconfig')
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
url="http://gtkmm.sourceforge.net/"
md5sums=('50d86a77398cd473ff13c4c9382e39bd')
md5sums=('7c52cc42085d30ac3b73d74c3f2eb22e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......@@ -22,7 +22,7 @@ build() {
package_glibmm() {
pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
depends=('glib2' 'libsigc++2.0')
depends=('glib2' 'libsigc++')
cd "${srcdir}/${pkgbase}-${pkgver}"
sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
make DESTDIR="${pkgdir}" install
......
......@@ -5,8 +5,8 @@
# Maintainer: BrLi <rainman59118[at]Gmail.com>
pkgname=libmirage
pkgver=2.1.1
pkgrel=3
pkgver=3.0.3
pkgrel=1
pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library"
arch=('x86_64')
url="http://cdemu.sourceforge.net/"
......@@ -15,7 +15,7 @@ depends=('glib2' 'libsndfile' 'zlib' 'xz' 'bzip2' 'libsamplerate')
makedepends=('bison' 'flex' 'cmake')
optdepends=('gobject-introspection')
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2")
md5sums=('be5349fff21c2999f324b9f86190ed07')
md5sums=('fd0009ced98ef47c94d2919eafcaa099')
build() {
cd $srcdir/$pkgname-$pkgver
......@@ -27,6 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DPOST_INSTALL_HOOKS:BOOL=OFF \
-DWITH_GTKDOC=OFF
make
}
......
--- a/libmirage/CMakeLists.txt 2012-12-09 18:06:35.000000000 -0500
+++ b/libmirage/CMakeLists.txt 2013-01-06 21:05:30.921363544 -0500
@@ -28,12 +28,11 @@
include (GNUInstallDirs)
include (GObjectIntrospection)
-include (GtkDoc)
include (Utilities)
include (FileList)
# Options
-option (GTKDOC_ENABLED "Use gtk-doc to build documentation" on)
+option (GTKDOC_ENABLED "Use gtk-doc to build documentation" off)
option (INTROSPECTION_ENABLED "Generate gobject introspection files" on)
option (POST_INSTALL_HOOKS "Run post-install hooks" on)
--- a/libmirage/CMakeLists.txt
+++ b/libmirage/CMakeLists.txt
@@ -112,7 +112,8 @@
COMPILE_DEFINITIONS "${mirage_DEFS}"
LINK_FLAGS ${mirage_LDFLAGS_STR}
LIBRARY_OUTPUT_NAME mirage
- SOVERSION ${MIRAGE_SOVERSION}
+ VERSION ${MIRAGE_SOVERSION}
+ SOVERSION ${MIRAGE_LT_CURRENT}
)
......@@ -2,14 +2,14 @@
pkgbase=pygobject
pkgname=(python2-gobject python3-gobject pygobject-devel)
pkgver=3.12.2
pkgrel=3
arch=(i686 x86_64)
pkgver=3.14.0
pkgrel=1
arch=('x86_64')
url="https://live.gnome.org/PyGObject"
license=(LGPL)
makedepends=(python2 python2-cairo gobject-introspection gnome-common python3 python3-cairo)
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
sha256sums=('7e7a3d349acf5bb4b68f8539a42e67958840a67cd4f0341ee9aa49189af2a522')
sha256sums=('779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54')
prepare() {
......@@ -45,6 +45,7 @@ package_python2-gobject() {
cd build-py2
make DESTDIR="$pkgdir" install
mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
python2 -m compileall "$pkgdir"//usr/lib/python2.7/site-packages/gi
}
package_pygobject-devel() {
......
# maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
pkgname=upower
pkgver=0.99.1
pkgver=0.99.2
pkgrel=1
pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
arch=('x86_64')
......@@ -11,7 +11,7 @@ depends=('systemd' 'systemd' 'libusb' 'polkit' 'dbus-glib' 'libimobiledevice')
makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
backup=('etc/UPower/UPower.conf')
source=($url/releases/$pkgname-$pkgver.tar.xz)
md5sums=('e21ea7875e46142e37695850754a296a')
md5sums=('93119fcb617a75ff9cd44999179ec217')
prepare() {
cd $pkgname-$pkgver
......
From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimo@endlessm.com>
Date: Tue, 25 Feb 2014 09:43:04 +0000
Subject: Create the history directory at runtime
In addition to build time - this increases compatibilty with OSTree,
which starts out with an empty /var.
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
diff --git a/src/up-history.c b/src/up-history.c
index f9d0fdf..795b093 100644
--- a/src/up-history.c
+++ b/src/up-history.c
@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir)
{
g_free (history->priv->dir);
history->priv->dir = g_strdup (dir);
+ g_mkdir_with_parents (dir, 0755);
}
/**
@@ -887,7 +888,8 @@ up_history_init (UpHistory *history)
history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE;
- history->priv->dir = g_build_filename (HISTORY_DIR, NULL);
+
+ up_history_set_directory (history, HISTORY_DIR);
}
/**
--
cgit v0.9.0.2-2-gbebe
From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@gnome.org>
Date: Fri, 08 Nov 2013 13:59:50 +0000
Subject: lib: Fix segfault on getting property when daemon is not running
This fixes "upower --version" when the daemon is not running, and thus the
client proxy is NULL.
---
diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
index 35d7b5d..17fb02d 100644
--- a/libupower-glib/up-client.c
+++ b/libupower-glib/up-client.c
@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
UpClient *client;
client = UP_CLIENT (object);
+ if (client->priv->proxy == NULL)
+ return;
+
switch (prop_id) {
case PROP_DAEMON_VERSION:
g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
--
cgit v0.9.0.2-2-gbebe
post_install() {
echo "Enabling systemd service"
systemctl enable upower.service
}
post_upgrade() {
post_install
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable upower.service
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment