summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFélix Piédallu2017-08-18 13:46:47 +0200
committerFélix Piédallu2017-08-18 13:46:47 +0200
commit35ad5dd0a635cf4f3b949a06c006286b0b8ad224 (patch)
tree3dfbbe9c8d960ddad2586ca416ab86d374e915da
parentc3423f8518aa1aeafe2557e2d2c85021e030592d (diff)
downloadaur-35ad5dd0a635cf4f3b949a06c006286b0b8ad224.tar.gz
oops, bad patch (spaces vs tabs). mute pushd.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--livewallpaper.patch24
3 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66963fbd83e..60be0a7b417 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Aug 18 10:34:08 UTC 2017
+# Fri Aug 18 11:45:30 UTC 2017
pkgbase = livewallpaper
pkgdesc = OpenGL powered animated wallpapers with configuration utility, autostart, and application indicator.
pkgver = 0.5.0
@@ -23,7 +23,7 @@ pkgbase = livewallpaper
source = https://launchpad.net/livewallpaper/0.5/0.5.0/+download/livewallpaper-0.5.0.tar.gz
source = livewallpaper.patch
sha256sums = f4ce97a721015b135eb675915eb306c1fb256e680d480fe13e4fe6ca81c7e04e
- sha256sums = a7e2c63c98f574fc0a64dcffd478e3ba534a7805d5416c9089a2fdf8f869c694
+ sha256sums = 09945264707109bbebca632b40a7607b3ef882fe2fadd15d235f18ef0763a279
pkgname = livewallpaper
diff --git a/PKGBUILD b/PKGBUILD
index eec3752f44c..b905efd4d18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ source=(
sha256sums=(
'f4ce97a721015b135eb675915eb306c1fb256e680d480fe13e4fe6ca81c7e04e'
- 'a7e2c63c98f574fc0a64dcffd478e3ba534a7805d5416c9089a2fdf8f869c694'
+ '09945264707109bbebca632b40a7607b3ef882fe2fadd15d235f18ef0763a279'
)
prepare() {
@@ -34,14 +34,14 @@ prepare() {
# * Fix old API (fromstring/tostring to frombytes/tobytes)
# * CMake : remove debian dir
# * CMake : disable doc generation (needs gtk-doc)
- patch -p2 -i "${srcdir}/livewallpaper.patch"
+ patch -p1 -l -i "${srcdir}/livewallpaper.patch"
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
rm -rf "build"
mkdir "build"
- pushd "build"
+ pushd "build" >/dev/null
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make DESTDIR="${pkgdir}"
@@ -49,7 +49,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- pushd "build"
+ pushd "build" >/dev/null
make DESTDIR="${pkgdir}" install
}
diff --git a/livewallpaper.patch b/livewallpaper.patch
index 436b319d7fe..08119bc475b 100644
--- a/livewallpaper.patch
+++ b/livewallpaper.patch
@@ -1,6 +1,6 @@
-diff --git a/livewallpaper-0.5.0/CMakeLists.txt b/livewallpaper-0.5.0/CMakeLists.txt
---- a/livewallpaper-0.5.0/CMakeLists.txt
-+++ b/livewallpaper-0.5.0/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -66,10 +66,8 @@ add_subdirectory(cmake)
add_subdirectory(ui)
add_subdirectory(po)
@@ -12,17 +12,17 @@ diff --git a/livewallpaper-0.5.0/CMakeLists.txt b/livewallpaper-0.5.0/CMakeLists
livewallpaper_plugin_post_install()
-diff --git a/livewallpaper-0.5.0/plugins/circles/circles.py b/livewallpaper-0.5.0/plugins/circles/circles.py
---- a/livewallpaper-0.5.0/plugins/circles/circles.py
-+++ b/livewallpaper-0.5.0/plugins/circles/circles.py
+diff --git a/plugins/circles/circles.py b/plugins/circles/circles.py
+--- a/plugins/circles/circles.py
++++ b/plugins/circles/circles.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
#
#
# Livewallpaper
-diff --git a/livewallpaper-0.5.0/plugins/photoslide/photoslide.py b/livewallpaper-0.5.0/plugins/photoslide/photoslide.py
---- a/livewallpaper-0.5.0/plugins/photoslide/photoslide.py
-+++ b/livewallpaper-0.5.0/plugins/photoslide/photoslide.py
+diff --git a/plugins/photoslide/photoslide.py b/plugins/photoslide/photoslide.py
+--- a/plugins/photoslide/photoslide.py
++++ b/plugins/photoslide/photoslide.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
#
@@ -39,9 +39,9 @@ diff --git a/livewallpaper-0.5.0/plugins/photoslide/photoslide.py b/livewallpape
imgsurface = cairo.ImageSurface.create_for_data(imgarr, cairo.FORMAT_ARGB32, width, height, width * 4)
cr.set_source_surface(imgsurface, (self.img_width - width) / 2, (self.img_height - height) / 2)
cr.paint()
-diff --git a/livewallpaper-0.5.0/ui/config/files-selector.vala b/livewallpaper-0.5.0/ui/config/files-selector.vala
---- a/livewallpaper-0.5.0/ui/config/files-selector.vala
-+++ b/livewallpaper-0.5.0/ui/config/files-selector.vala
+diff --git a/ui/config/files-selector.vala b/ui/config/files-selector.vala
+--- a/ui/config/files-selector.vala
++++ b/ui/config/files-selector.vala
@@ -55,7 +55,7 @@ public class FilesSelector : Box {
if (ts.count_selected_rows () > 0) {
TreeIter it;