summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2015-07-13 09:27:02 +0200
committerChristian Hesse2015-07-13 09:27:02 +0200
commitaa1659b7ea401ed78c7615705f45e0c4e0fd491d (patch)
treed0d20d0cfb42416f38803ac23f2ca199c0873a88
parentea836cc34f8833ada12d4d1ae29a544d209adb0e (diff)
downloadaur-aa1659b7ea401ed78c7615705f45e0c4e0fd491d.tar.gz
commit uswsusp-git 0.r501.g668c5f7-7
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD18
-rw-r--r--no-inline.patch69
3 files changed, 83 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dc93f0b10f4..784cd7258c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = uswsusp-git
pkgdesc = Userspace software suspend - git checkout
pkgver = 0.r501.g668c5f7
- pkgrel = 6
+ pkgrel = 7
url = http://suspend.sourceforge.net/
install = uswsusp.install
arch = i686
@@ -10,6 +10,7 @@ pkgbase = uswsusp-git
makedepends = git
depends = libx86
depends = lzo2
+ depends = pciutils
provides = uswsusp
conflicts = uswsusp
backup = etc/suspend.conf
@@ -19,12 +20,14 @@ pkgbase = uswsusp-git
source = print-no-version.patch
source = load-checksum-mismatch.patch
source = no-deprecated-switch.patch
+ source = no-inline.patch
sha256sums = SKIP
sha256sums = 2662d879ca7a2339233c8bdce123f0d686397093759ca54f162a3577603587b0
sha256sums = 9fe3e38301014b4c8597aec2041ad3c6d85e6935004cbd3ac93659d391db3157
sha256sums = cdf29e41f35469b134bb6421ba109e8398e1f3e88ec4e1d41b015920e420ee44
sha256sums = fe8d5c831302125fd92ba6e48cacaf0359925d41de5623be2b8525a0cdf1fcc6
sha256sums = d8a4f646d0785adf038830f14564f20ea307a27f225c17eb581a2e4d5e0c8519
+ sha256sums = fc303c78d3ae0794f8a267e9b8b9fec665b7413f396310d1a19efedcd2a1760d
pkgname = uswsusp-git
diff --git a/PKGBUILD b/PKGBUILD
index 4c3d2ae93c3..5cc7164f7f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,31 @@
pkgname=uswsusp-git
pkgver=0.r501.g668c5f7
-pkgrel=6
+pkgrel=7
pkgdesc='Userspace software suspend - git checkout'
arch=('i686' 'x86_64')
url='http://suspend.sourceforge.net/'
license=('GPL')
-#depends=('libgcrypt' 'libx86' 'lzo2')
-depends=('libx86' 'lzo2')
+depends=('libx86' 'lzo2' 'pciutils')
makedepends=('git')
provides=('uswsusp')
conflicts=('uswsusp')
backup=('etc/suspend.conf')
install=uswsusp.install
source=('git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-utils.git'
- 'uresume-hook'
+ 'uresume-hook'
'uresume-install'
- 'print-no-version.patch'
- 'load-checksum-mismatch.patch'
- 'no-deprecated-switch.patch')
+ 'print-no-version.patch'
+ 'load-checksum-mismatch.patch'
+ 'no-deprecated-switch.patch'
+ 'no-inline.patch')
sha256sums=('SKIP'
'2662d879ca7a2339233c8bdce123f0d686397093759ca54f162a3577603587b0'
'9fe3e38301014b4c8597aec2041ad3c6d85e6935004cbd3ac93659d391db3157'
'cdf29e41f35469b134bb6421ba109e8398e1f3e88ec4e1d41b015920e420ee44'
'fe8d5c831302125fd92ba6e48cacaf0359925d41de5623be2b8525a0cdf1fcc6'
- 'd8a4f646d0785adf038830f14564f20ea307a27f225c17eb581a2e4d5e0c8519')
+ 'd8a4f646d0785adf038830f14564f20ea307a27f225c17eb581a2e4d5e0c8519'
+ 'fc303c78d3ae0794f8a267e9b8b9fec665b7413f396310d1a19efedcd2a1760d')
pkgver() {
cd suspend-utils/
@@ -44,6 +45,7 @@ build() {
patch -Np1 < "${srcdir}/print-no-version.patch"
patch -Np1 < "${srcdir}/load-checksum-mismatch.patch"
patch -Np1 < "${srcdir}/no-deprecated-switch.patch"
+ patch -Np1 < "${srcdir}/no-inline.patch"
sed -i "s/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac
mkdir m4
diff --git a/no-inline.patch b/no-inline.patch
new file mode 100644
index 00000000000..4648232f1f6
--- /dev/null
+++ b/no-inline.patch
@@ -0,0 +1,69 @@
+diff --git a/bootsplash.c b/bootsplash.c
+index 44b1531..17cc13c 100644
+--- a/bootsplash.c
++++ b/bootsplash.c
+@@ -93,7 +93,7 @@ void bootsplash_switch_to(void)
+ }
+ }
+
+-inline int bootsplash_progress(int p)
++int bootsplash_progress(int p)
+ {
+ char buf[MAX_LINE_SIZE];
+
+diff --git a/loglevel.c b/loglevel.c
+index 2213cbf..1cb6d87 100644
+--- a/loglevel.c
++++ b/loglevel.c
+@@ -16,7 +16,7 @@
+ static FILE *printk_file;
+ static int proc_mounted = 0;
+
+-inline void open_printk(void)
++void open_printk(void)
+ {
+ struct stat stat_buf;
+ char *procname = "/proc/sys/kernel/printk";
+@@ -32,7 +32,7 @@ inline void open_printk(void)
+ printk_file = fopen(procname, "r+");
+ }
+
+-inline int get_kernel_console_loglevel(void)
++int get_kernel_console_loglevel(void)
+ {
+ int level = -1;
+
+@@ -43,7 +43,7 @@ inline int get_kernel_console_loglevel(void)
+ return level;
+ }
+
+-inline void set_kernel_console_loglevel(int level)
++void set_kernel_console_loglevel(int level)
+ {
+ if (printk_file) {
+ rewind(printk_file);
+@@ -53,7 +53,7 @@ inline void set_kernel_console_loglevel(int level)
+
+ }
+
+-inline void close_printk(void)
++void close_printk(void)
+ {
+ if (printk_file)
+ fclose(printk_file);
+diff --git a/loglevel.h b/loglevel.h
+index e042ae3..82dee9c 100644
+--- a/loglevel.h
++++ b/loglevel.h
+@@ -4,7 +4,7 @@
+ * (c) 2007 Tim Dijkstra
+ */
+
+-inline void open_printk(void);
+-inline int get_kernel_console_loglevel(void);
+-inline void set_kernel_console_loglevel(int level);
+-inline void close_printk(void);
++void open_printk(void);
++int get_kernel_console_loglevel(void);
++void set_kernel_console_loglevel(int level);
++void close_printk(void);