| 1 |
commit: bcaf2fbb854b1fffc004ff9094050526fadc8f81 |
| 2 |
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net> |
| 3 |
AuthorDate: Sun Apr 29 18:27:00 2012 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net> |
| 5 |
CommitDate: Sun Apr 29 18:27:00 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcaf2fbb |
| 7 |
|
| 8 |
[kde-base/kdm] Remove Grub2 patch, since a fix has been applied upstream. |
| 9 |
|
| 10 |
(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kdm/files/kdm-4.8.2-grub2.patch | 14 -------------- |
| 14 |
kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 - |
| 15 |
kde-base/kdm/kdm-9999.ebuild | 1 - |
| 16 |
3 files changed, 0 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/files/kdm-4.8.2-grub2.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index d48bd10..0000000 |
| 21 |
--- a/kde-base/kdm/files/kdm-4.8.2-grub2.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,14 +0,0 @@ |
| 24 |
-diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/bootman.c |
| 25 |
---- kdm-4.8.2_orig/kdm/backend/bootman.c 2012-03-30 05:02:31.000000000 +0700 |
| 26 |
-+++ kdm-4.8.2/kdm/backend/bootman.c 2012-04-26 09:33:58.683462475 +0700 |
| 27 |
-@@ -224,8 +224,8 @@ |
| 28 |
- static int |
| 29 |
- getGrub2(char ***opts, int *def, int *cur) |
| 30 |
- { |
| 31 |
-- grubConfig = "/boot/grub/grub.cfg"; |
| 32 |
-- return getGrub2OrBurg(opts, def, cur, "grub-reboot"); |
| 33 |
-+ grubConfig = "/boot/grub2/grub.cfg"; |
| 34 |
-+ return getGrub2OrBurg(opts, def, cur, "grub2-reboot"); |
| 35 |
- } |
| 36 |
- |
| 37 |
- static int |
| 38 |
|
| 39 |
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild |
| 40 |
index 36cb1d4..93e9fec 100644 |
| 41 |
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild |
| 42 |
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild |
| 43 |
@@ -40,7 +40,6 @@ KMEXTRA=" |
| 44 |
PATCHES=( |
| 45 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
| 46 |
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
| 47 |
- "${FILESDIR}/${PN}-4.8.2-grub2.patch" |
| 48 |
) |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
|
| 52 |
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild |
| 53 |
index 36cb1d4..93e9fec 100644 |
| 54 |
--- a/kde-base/kdm/kdm-9999.ebuild |
| 55 |
+++ b/kde-base/kdm/kdm-9999.ebuild |
| 56 |
@@ -40,7 +40,6 @@ KMEXTRA=" |
| 57 |
PATCHES=( |
| 58 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
| 59 |
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
| 60 |
- "${FILESDIR}/${PN}-4.8.2-grub2.patch" |
| 61 |
) |
| 62 |
|
| 63 |
pkg_setup() { |
Archives