Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=21e16dad8f90824d925b2e2c6be3062d4193b8c2
commit 21e16dad8f90824d925b2e2c6be3062d4193b8c2
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sat Dec 18 19:40:37 2010 +0100
systemd-15-32-i686
*enable systemd fronted
diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 09e28b9..ba20eba 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -4,17 +4,17 @@
USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"}
USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}
USE_TCP=${USE_TCP:-"n"}
-USE_GUI=${USE_GUI:-"n"}
+USE_GUI=${USE_GUI:-"y"}
USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"}
pkgname=systemd
pkgver=15
-pkgrel=31
+pkgrel=32
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \
build-sys-frugalware-linux-support.patch sysv_translate_name.patch
getty-after-rc.local.patch \
- service-ifdef-distro-specific-compat-logic.patch console.conf
prefdm.service)
+ service-ifdef-distro-specific-compat-logic.patch console.conf
prefdm.service libnotify.diff libnotify2.diff)
up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts'
'sysvinit-tools')
makedepends=('vala')
@@ -52,20 +52,20 @@ else
replaces=("${replac...@]}" 'systemd-gtk')
fi
-subpkgs=(${subpkgs} 'systemd-sysvinit')
-subdescs=('systemd System V init tools')
-subrodepends=(${subrodepen...@]} "$pkgname=$pkgver")
-subdepends=(${subdepen...@]} '')
+subpkgs=("${subpk...@]}" 'systemd-sysvinit')
+subdescs=("${subdes...@]}" 'systemd System V init tools')
+subrodepends=("${subrodepen...@]}" "$pkgname=$pkgver")
+subdepends=("${subdepen...@]}" '')
if Fuse $USE_SYSV_REPLACE; then
- subreplaces=(${subreplac...@]} 'sysvinit')
- subgroups=(${subgrou...@]} 'base')
+ subreplaces=("${subreplac...@]}" 'sysvinit')
+ subgroups=("${subgrou...@]}" 'base')
else
- subreplaces=(${subreplac...@]} '')
- subgroups=(${subgrou...@]} 'base-extra')
+ subreplaces=("${subreplac...@]}" '')
+ subgroups=("${subgrou...@]}" 'base-extra')
fi
-subarchs=(${subarc...@]} 'i686 x86_64 ppc')
-subprovides=(${subprovid...@]} 'sysvinit')
-subconflicts=(${subconflic...@]} 'sysvinit')
+subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
+subprovides=("${subprovid...@]}" 'sysvinit')
+subconflicts=("${subconflic...@]}" 'sysvinit')
Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware
--with-pamlibdir=/lib/security \
--with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
@@ -169,5 +169,8 @@ sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \
'd99972f51c65261f2ced039ce5a4db719c19cca2' \
'e98981d01cb1229936c28005d1a499475c07d913' \
'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
- 'fdb7dc79f5a0d120e722c152f956a841667fe011')
+ 'fdb7dc79f5a0d120e722c152f956a841667fe011' \
+ 'c7b3adce7788e68ab53744a02ff955f6c797b806' \
+ '8cde1941ef2900871115753fb7f20f1fcf07ba7b')
+
diff --git a/source/base/systemd/libnotify.diff
b/source/base/systemd/libnotify.diff
new file mode 100644
index 0000000..2221732
--- /dev/null
+++ b/source/base/systemd/libnotify.diff
@@ -0,0 +1,92 @@
+From d0ef2204b4256189afc2188f0765338d616ca757 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.siev...@vrfy.org>
+Date: Fri, 26 Nov 2010 16:59:53 +0000
+Subject: gnome-ask-password-agent: also support libnotify < 0.7 for now
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index 471954b..baf8271 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
+ --pkg=gtk+-2.0 \
+ --pkg=linux \
+ --pkg=gio-unix-2.0 \
+- --pkg=libnotify \
++ --pkg=libnotify
++if LIBNOTIFY07
++systemd_gnome_ask_password_agent_VALAFLAGS += \
++ -D LIBNOTIFY07
++endif
++systemd_gnome_ask_password_agent_VALAFLAGS += \
+ -g
+
+ systemd_gnome_ask_password_agent_LDADD = \
+diff --git a/configure.ac b/configure.ac
+index 5a6f3c7..dfbce11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then
+ AC_SUBST(DBUSGLIB_CFLAGS)
+ AC_SUBST(DBUSGLIB_LIBS)
+
+- PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ])
++ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ],
++ [ libnotify07=yes ],
++ [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
++ )
++ AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
+ AC_SUBST(LIBNOTIFY_CFLAGS)
+ AC_SUBST(LIBNOTIFY_LIBS)
+ fi
+
+-AM_PROG_VALAC([0.11])
++AM_PROG_VALAC([0.10])
+ AC_SUBST(VAPIDIR)
+ AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
+
+diff --git a/src/gnome-ask-password-agent.vala
b/src/gnome-ask-password-agent.vala
+index 6cab6f9..61bbba0 100644
+--- a/src/gnome-ask-password-agent.vala
++++ b/src/gnome-ask-password-agent.vala
+@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog {
+ set_default_response(ResponseType.OK);
+ set_icon_name(icon);
+
++#if LIBNOTIFY07
+ add_button(Stock.CANCEL, ResponseType.CANCEL);
+ add_button(Stock.OK, ResponseType.OK);
++#else
++ add_button(STOCK_CANCEL, ResponseType.CANCEL);
++ add_button(STOCK_OK, ResponseType.OK);
++#endif
+
+ Container content = (Container) get_content_area();
+
+@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon {
+
+ set_visible(true);
+
++#if LIBNOTIFY07
+ Notification n = new Notification(title, message, icon);
++#else
++ Notification n = new Notification(title, message, icon, null);
++ n.attach_to_status_icon(this);
++#endif
+ n.set_timeout(5000);
+ n.show();
+
+@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon {
+
+ OutputStream stream = new UnixOutputStream(to_process, true);
+
++#if LIBNOTIFY07
+ stream.write(password.data, null);
++#else
++ stream.write(password, password.length, null);
++#endif
+ }
+ }
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/source/base/systemd/libnotify2.diff
b/source/base/systemd/libnotify2.diff
new file mode 100644
index 0000000..42a0369
--- /dev/null
+++ b/source/base/systemd/libnotify2.diff
@@ -0,0 +1,32 @@
+From ab85c225e0bf0ea432027715976cea00182f03c5 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <bi...@debian.org>
+Date: Sat, 27 Nov 2010 12:29:14 +0000
+Subject: Ensure LIBNOTIFY07 conditional is always set
+
+Also use PKG_CHECK_EXISTS to test if libnotify is recent enough
+---
+diff --git a/configure.ac b/configure.ac
+index dfbce11..4d29d5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,14 +259,13 @@ if test "$have_gtk" = "yes"; then
+ AC_SUBST(DBUSGLIB_CFLAGS)
+ AC_SUBST(DBUSGLIB_LIBS)
+
+- PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ],
+- [ libnotify07=yes ],
+- [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
+- )
+- AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
++ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
++ PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
++
+ AC_SUBST(LIBNOTIFY_CFLAGS)
+ AC_SUBST(LIBNOTIFY_LIBS)
+ fi
++AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
+
+ AM_PROG_VALAC([0.10])
+ AC_SUBST(VAPIDIR)
+--
+cgit v0.8.3-6-g21f6
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
