diff options
author | Luo Jinghua <sunmoon1997@gmail.com> | 2010-11-22 13:15:49 +0800 |
---|---|---|
committer | Luo Jinghua <sunmoon1997@gmail.com> | 2010-11-22 13:15:49 +0800 |
commit | cb14b3df57b76bec849a23980cc29dc00c8e090e (patch) | |
tree | e5df31a8246de1e0ce987bda1ffb7f9bb2470524 | |
parent | ac8768d6628e8f6dfb78a027d8eee3b5091a9a66 (diff) |
add a patch to get systemd compile on my system
-rw-r--r-- | sys-apps/systemd/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch | 67 |
2 files changed, 68 insertions, 0 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index a84a2f8..16c7efa 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,5 +1,6 @@ AUX 0001-fixup-xdm.service-for-gentoo.patch 724 RMD160 e0fe38fc93fd678a06c34ce91694e278d4a56503 SHA1 5e402fd5c0c0bb908d95262f96e7af98ce5641e3 SHA256 ae81de07146b571b993a821fdddb2dda7d25b7c306ab0681b7eb70071bb5912b AUX 0002-never-umount-lib-rc-init.d.patch 803 RMD160 6e62d9631496984ff8b7c8938e279f1f43439ce8 SHA1 5a377c49813fb390022cde987acbbf528b7a3f55 SHA256 eccc3ba9ea0172bf6a7eae8ad9b823275b3e7a319a1688f22a452f649ba8c310 AUX 0003-gentoo-set-default-sysvinitd-to-etc-init.d.patch 941 RMD160 f04619d3119be124bb1c3bf0a5a746f4562fe267 SHA1 d3c89264a0da46a14af414705fa0cf2bb7e549c4 SHA256 dd27231e7c239d6825b0d7373716b42ac35e53b5463bc95a63c249184a3dce4d +AUX 0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch 2303 RMD160 f9586c1d4b63b644f1d5a9b40dcaf91aa805688b SHA1 20734ef62fed74700762a236bbe1132a5779a490 SHA256 0686fec75dddc69ed5f92d68375615fce0e24be55389f613b108c1de53636cde EBUILD systemd-9999.ebuild 1688 RMD160 3776c4fe990547cb684a90baece0c36148eddd9f SHA1 a744eb9410f49161a7098b521805d7b4b53433fb SHA256 f43afffb8939e9bffc449d191114edf8860595e26b5d65b33f20ce69b39ced7a MISC metadata.xml 285 RMD160 a394b62e33a5c004c74938e8105bd29b135dc6bc SHA1 672d2415dd51ce2c12c36c659c7926a9b2345fed SHA256 0d6905daec8d05c9a874142bfcc3084691ba54df9328d04bd7dd5a9f64ff4c54 diff --git a/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch b/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch new file mode 100644 index 0000000..3ce3ed8 --- /dev/null +++ b/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch @@ -0,0 +1,67 @@ +From 25295d8445f9dfddd45c108545d8b6974e1785cb Mon Sep 17 00:00:00 2001 +From: Luo Jinghua <sunmoon1997@gmail.com> +Date: Fri, 19 Nov 2010 10:46:36 +0800 +Subject: [PATCH 5/5] Revert "build-sys: fix building against libnotify 0.7" + +This reverts commit 5c273f855630bf54f6ebe95ea8b45c8abe2ffff6. +--- + configure.ac | 4 ++-- + src/gnome-ask-password-agent.vala | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d99f02b..45ab664 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -256,12 +256,12 @@ 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 ]) + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + fi + +-AM_PROG_VALAC([0.11]) ++AM_PROG_VALAC([0.9]) + 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..1523e2e 100644 +--- a/src/gnome-ask-password-agent.vala ++++ b/src/gnome-ask-password-agent.vala +@@ -38,8 +38,8 @@ public class PasswordDialog : Dialog { + set_default_response(ResponseType.OK); + set_icon_name(icon); + +- add_button(Stock.CANCEL, ResponseType.CANCEL); +- add_button(Stock.OK, ResponseType.OK); ++ add_button(STOCK_CANCEL, ResponseType.CANCEL); ++ add_button(STOCK_OK, ResponseType.OK); + + Container content = (Container) get_content_area(); + +@@ -181,7 +181,8 @@ public class MyStatusIcon : StatusIcon { + + set_visible(true); + +- Notification n = new Notification(title, message, icon); ++ Notification n = new Notification(title, message, icon, null); ++ n.attach_to_status_icon(this); + n.set_timeout(5000); + n.show(); + +@@ -225,7 +226,7 @@ public class MyStatusIcon : StatusIcon { + + OutputStream stream = new UnixOutputStream(to_process, true); + +- stream.write(password.data, null); ++ stream.write(password, password.length, null); + } + } + +-- +1.7.3.2 + |