aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-09-06 19:15:36 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-09-06 19:15:44 -0300
commitdd2993cfa29fa43dbf19fb58ed29079de3c55a22 (patch)
tree9d364201583b557a2caa735a982fab8eeba66ad4
parent15171f825dc2d50b3310ab3087d181049c9e38bd (diff)
downloadaports-dd2993cfa29fa43dbf19fb58ed29079de3c55a22.tar.gz
aports-dd2993cfa29fa43dbf19fb58ed29079de3c55a22.tar.bz2
aports-dd2993cfa29fa43dbf19fb58ed29079de3c55a22.tar.xz
community/rofi: upgrade to 1.6.0
-rw-r--r--community/rofi/APKBUILD60
-rw-r--r--community/rofi/fix-meson-pc-ver.patch14
2 files changed, 51 insertions, 23 deletions
diff --git a/community/rofi/APKBUILD b/community/rofi/APKBUILD
index 877f7bf5a8..256f0552e6 100644
--- a/community/rofi/APKBUILD
+++ b/community/rofi/APKBUILD
@@ -1,49 +1,63 @@
# Contributor: Marvin Steadfast <marvin@xsteadfastx.org>
# Maintainer: Marvin Steadfast <marvin@xsteadfastx.org>
pkgname=rofi
-pkgver=1.5.4
-pkgrel=2
-_libnkutils=8adccd3b1b33b2a9a29dd12a7e686907bbafc5d4
-pkgdesc="A window switcher, application launcher and dmenu replacement"
+pkgver=1.6.0
+pkgrel=0
+_libnkutils=6164bacaef10031ce77380499cfad2ae818ab6b0
+_libgwater=e6faf48267ae40547cb86c125f265f54f382df1c
+pkgdesc="Window switcher, application launcher and dmenu replacement"
url="https://github.com/DaveDavenport/rofi"
arch="all !s390x !mips !mips64" # Limited by librsvg
license="MIT"
-makedepends="meson bison flex pangomm-dev pango-dev libxcb-dev xcb-util-dev
- xcb-util-wm-dev xcb-util-xrm-dev glib-dev cairo-dev libxkbcommon-dev
- librsvg-dev startup-notification-dev ronn"
-checkdepends="cppcheck xkeyboard-config"
+makedepends="
+ meson
+ glib-dev
+ cairo-dev
+ pango-dev
+ libxkbcommon-dev
+ librsvg-dev
+ libjpeg-turbo-dev
+ libxcb-dev
+ xcb-util-dev
+ xcb-util-wm-dev
+ xcb-util-xrm-dev
+ startup-notification-dev
+ flex
+ bison
+ ronn
+ "
+checkdepends="cppcheck check-dev xkeyboard-config"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/davatorium/rofi/releases/download/$pkgver/rofi-$pkgver.tar.gz
- https://github.com/sardemff7/libnkutils/archive/$_libnkutils.tar.gz
+ libnkutils-$_libnkutils.tar.gz::https://github.com/sardemff7/libnkutils/archive/$_libnkutils.tar.gz
+ libgwater-$_libgwater.tar.gz::https://github.com/sardemff7/libgwater/archive/$_libgwater.tar.gz
scrollbar-test.patch
+ fix-meson-pc-ver.patch
"
prepare() {
default_prepare
- rm -rf subprojects/libnkutils
+ rm -rf subprojects/libnkutils subprojects/libgwater
mv "$srcdir"/libnkutils-$_libnkutils subprojects/libnkutils
+ mv "$srcdir"/libgwater-$_libgwater subprojects/libgwater
}
build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=plain \
- . output
- ninja -C output
+ abuild-meson . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- ninja -C output test
+ meson test --no-rebuild -v -C output
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="317c9c4930fea21cb72d8551cc6f8ebb66a1fb2477e361a95fd3e5823a3b6597fdf74e110d45b4e9c17712ecf4c5a16bbedd159ec03d83f4ec23b8390cf398f7 rofi-1.5.4.tar.gz
-f527572eac0247f44ce16833cd5795f42e9a79b8f4e4f02df7c96fd1aac3db685ea95ff1048e4415ac4bbec0f5e37f5986efe1811b8991cab4d4f88518cbf0bd 8adccd3b1b33b2a9a29dd12a7e686907bbafc5d4.tar.gz
-2edf85133c4ce1817a37ea480913725ff086bc570bcac7ea5100d7516dce816ba6471e530a1d979fbaf0d68ce2d4e4e7ddc9c32f238c2ac2db95fde98f62a44e scrollbar-test.patch"
+sha512sums="a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23 rofi-1.6.0.tar.gz
+b1e3b87782aa482063d1038e2bbceccba227b4b191e2de96662c64f4752739acf8ccb43f3fb35039ea3011881b737dbb3e8cb96240bcfc1f5237d8a84a2f37a6 libnkutils-6164bacaef10031ce77380499cfad2ae818ab6b0.tar.gz
+f3966472289ee4f2c1f2a6f51f22c70c992e715102f79648dbbf8d77d597f5eda0e471a9e8058629fce87d8570ac32b2d87cb62b75bc310199685cf6be0c74bd libgwater-e6faf48267ae40547cb86c125f265f54f382df1c.tar.gz
+2edf85133c4ce1817a37ea480913725ff086bc570bcac7ea5100d7516dce816ba6471e530a1d979fbaf0d68ce2d4e4e7ddc9c32f238c2ac2db95fde98f62a44e scrollbar-test.patch
+62a28a2522105b0a3b2a12a9a21f7c2103b18e47269439fd1a4cd9cdae0db84d51efc3640aa1e41151373e13cfa624ed0d345256b7ff13fe0859478d19c8c365 fix-meson-pc-ver.patch"
diff --git a/community/rofi/fix-meson-pc-ver.patch b/community/rofi/fix-meson-pc-ver.patch
new file mode 100644
index 0000000000..2d08195de0
--- /dev/null
+++ b/community/rofi/fix-meson-pc-ver.patch
@@ -0,0 +1,14 @@
+Upstream: Should be
+Reason: Fixes version in pkg-config files
+
+diff --git a/meson.build b/meson.build
+index 9e89384..e9fa6e1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('rofi', 'c',
+- version: '1.5.4-dev',
++ version: '1.6.0',
+ meson_version: '>=0.47.0',
+ license: [ 'MIT' ],
+ default_options: [