Skip to content

Commit d2c240c

Browse files
aKqir24pre-commit-ci[bot]Elsie19
authored
upd(rofi): 1.7.9.1 -> 2.0.0 (pacstall#8314)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Elsie <hwengerstickel@protonmail.com>
1 parent 8468518 commit d2c240c

File tree

4 files changed

+91
-101
lines changed

4 files changed

+91
-101
lines changed

packagelist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,9 +674,7 @@ rider-bin
674674
rio-wayland-deb
675675
rio-x11-deb
676676
rnnoise
677-
rofi:pkgbase
678-
rofi:rofi-dev
679-
rofi:rofi
677+
rofi
680678
rofi-emoji
681679
rofi-wayland
682680
rofi-x11

packages/rofi/.SRCINFO

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
pkgbase = rofi
2-
pkgver = 1.7.9.1
3-
pkgdesc = A window switcher, application launcher, and dmenu replacement.
2+
pkgver = 2.0.0
3+
pkgdesc = Window switcher, application launcher, and dmenu replacement for wayland and x11
44
url = https://github.com/davatorium/rofi
55
arch = any
6+
depends = libglib2.0-0
7+
depends = libpango-1.0-0
8+
depends = libpangocairo-1.0-0
9+
depends = libcairo2
10+
depends = libgdk-pixbuf-2.0-0
11+
depends = libxkbcommon0
12+
depends = libwayland-client0
13+
depends = libwayland-cursor0
14+
depends = libwayland-egl1
615
depends = libcairo2
716
depends = libgdk-pixbuf-2.0-0
817
depends = libglib2.0-0>=2.72
@@ -19,10 +28,19 @@ pkgbase = rofi
1928
depends = libxcb1
2029
depends = libxkbcommon-x11-0
2130
depends = libxkbcommon0>=0.4.1
22-
makedepends = bison
31+
makedepends = gcc
32+
makedepends = meson
33+
makedepends = ninja-build
34+
makedepends = pkg-config
2335
makedepends = flex>=2.5.39
36+
makedepends = bison
37+
makedepends = libwayland-dev
38+
makedepends = libglib2.0-dev
39+
makedepends = libpango1.0-dev
2440
makedepends = libcairo2-dev
2541
makedepends = libgdk-pixbuf-2.0-dev
42+
makedepends = libxkbcommon-dev
43+
makedepends = wayland-protocols
2644
makedepends = libglib2.0-dev
2745
makedepends = libpango1.0-dev
2846
makedepends = libstartup-notification0-dev
@@ -35,34 +53,16 @@ pkgbase = rofi
3553
makedepends = libxcb-xinerama0-dev
3654
makedepends = libxcb-xkb-dev
3755
makedepends = libxcb1-dev
38-
makedepends = libxkbcommon-dev
3956
makedepends = libxkbcommon-x11-dev
40-
makedepends = pandoc
4157
makedepends = pkg-config
42-
checkdepends = check
58+
conflicts = rofi-dev
59+
replaces = rofi
60+
replaces = rofi-x11
61+
replaces = rofi-wayland
4362
license = MIT
4463
maintainer = Don Alfons <donnisnoni@outlook.com>
45-
source = @rofi~1.7.9.1::https://github.com/davatorium/rofi/releases/download/1.7.9.1/rofi-1.7.9.1.tar.gz
46-
sha256sums = bb2c0f073b4422acc51a3f97d05275a82464750a33d2f4b120e3d866bb7b9ae5
64+
maintainer = aKqir24 <aKqir24@github.com>
65+
source = https://github.com/davatorium/rofi/releases/download/2.0.0/rofi-2.0.0.tar.gz
66+
sha256sums = f81659b175306ff487e35d88d6b36128e85a793bfb56b64fa22c62eb54c4abd0
4767

4868
pkgname = rofi
49-
pkgdesc = A window switcher, application launcher, and dmenu replacement
50-
depends = libcairo2
51-
depends = libgdk-pixbuf-2.0-0
52-
depends = libglib2.0-0>=2.72
53-
depends = libpango-1.0-0>=1.50
54-
depends = libpangocairo-1.0-0
55-
depends = libstartup-notification0>=0.11
56-
depends = libxcb-cursor0
57-
depends = libxcb-ewmh2
58-
depends = libxcb-icccm4
59-
depends = libxcb-randr0
60-
depends = libxcb-util1
61-
depends = libxcb-xinerama0
62-
depends = libxcb-xkb1
63-
depends = libxcb1
64-
depends = libxkbcommon-x11-0
65-
depends = libxkbcommon0>=0.4.1
66-
67-
pkgname = rofi-dev
68-
pkgdesc = Development files for rofi

packages/rofi/rofi.pacscript

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
pkgbase="rofi"
2-
pkgname=("rofi" "rofi-dev")
3-
pkgver="1.7.9.1"
1+
pkgname="rofi"
2+
pkgver="2.0.0"
43
arch=("any")
54
url='https://github.com/davatorium/rofi'
65
license=("MIT")
7-
pkgdesc="A window switcher, application launcher, and dmenu replacement."
6+
pkgdesc="Window switcher, application launcher, and dmenu replacement for wayland and x11"
87
depends=(
8+
"libglib2.0-0"
9+
"libpango-1.0-0"
10+
"libpangocairo-1.0-0"
11+
"libcairo2"
12+
"libgdk-pixbuf-2.0-0"
13+
"libxkbcommon0"
14+
"libwayland-client0"
15+
"libwayland-cursor0"
16+
"libwayland-egl1"
917
"libcairo2"
1018
"libgdk-pixbuf-2.0-0"
1119
"libglib2.0-0>=2.72"
@@ -24,10 +32,19 @@ depends=(
2432
"libxkbcommon0>=0.4.1"
2533
)
2634
makedepends=(
27-
"bison"
35+
"gcc"
36+
"meson"
37+
"ninja-build"
38+
"pkg-config"
2839
"flex>=2.5.39"
40+
"bison"
41+
"libwayland-dev"
42+
"libglib2.0-dev"
43+
"libpango1.0-dev"
2944
"libcairo2-dev"
3045
"libgdk-pixbuf-2.0-dev"
46+
"libxkbcommon-dev"
47+
"wayland-protocols"
3148
"libglib2.0-dev"
3249
"libpango1.0-dev"
3350
"libstartup-notification0-dev"
@@ -40,51 +57,26 @@ makedepends=(
4057
"libxcb-xinerama0-dev"
4158
"libxcb-xkb-dev"
4259
"libxcb1-dev"
43-
"libxkbcommon-dev"
4460
"libxkbcommon-x11-dev"
45-
"pandoc"
4661
"pkg-config"
4762
)
48-
checkdepends=(
49-
"check"
50-
)
51-
source=("@${pkgbase}~${pkgver}::https://github.com/davatorium/rofi/releases/download/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
52-
sha256sums=("bb2c0f073b4422acc51a3f97d05275a82464750a33d2f4b120e3d866bb7b9ae5")
53-
maintainer=("Don Alfons <donnisnoni@outlook.com>")
63+
replaces=("${pkgname}" "${pkgname}-x11" "${pkgname}-wayland")
64+
conflicts=("rofi-dev")
65+
source=("https://github.com/davatorium/rofi/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
66+
sha256sums=("f81659b175306ff487e35d88d6b36128e85a793bfb56b64fa22c62eb54c4abd0")
67+
maintainer=("Don Alfons <donnisnoni@outlook.com>" "aKqir24 <aKqir24@github.com>")
5468

5569
prepare() {
56-
cd "${pkgbase}~${pkgver}"
57-
./configure --prefix=/usr
70+
cd "${pkgname}-${pkgver}"
71+
meson setup build/ --buildtype=release --prefix=/usr
5872
}
5973

6074
build() {
61-
cd "${pkgbase}~${pkgver}"
62-
make -j"${NCPU}"
63-
}
64-
65-
check() {
66-
cd "${pkgbase}~${pkgver}"
67-
make -j"${NCPU}" check
75+
cd "${pkgname}-${pkgver}"
76+
ninja -C build/ -j"${NCPU}"
6877
}
6978

70-
package_rofi() {
71-
pkgdesc="A window switcher, application launcher, and dmenu replacement"
72-
depends=("${depends[@]}")
73-
74-
cd "${pkgbase}~${pkgver}"
75-
make DESTDIR="${pkgdir}" install
76-
77-
rm -rf "${pkgdir:?}/usr/include/rofi"
78-
rm -f "${pkgdir:?}/usr/lib/pkgconfig/rofi.pc"
79-
}
80-
81-
package_rofi-dev() {
82-
pkgdesc="Development files for rofi"
83-
84-
cd "${pkgbase}~${pkgver}"
85-
make DESTDIR="${pkgdir}" install
86-
87-
rm -rf "${pkgdir:?}/usr/bin"
88-
rm -rf "${pkgdir:?}/usr/share"
89-
rm -rf "${pkgdir:?}/usr/lib/rofi"
79+
package() {
80+
cd "${pkgname}-${pkgver}"
81+
DESTDIR="${pkgdir}" ninja -C build/ install
9082
}

srclist

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13167,10 +13167,19 @@ pkgbase = rofi-x11
1316713167
pkgname = rofi-x11
1316813168
---
1316913169
pkgbase = rofi
13170-
pkgver = 1.7.9.1
13171-
pkgdesc = A window switcher, application launcher, and dmenu replacement.
13170+
pkgver = 2.0.0
13171+
pkgdesc = Window switcher, application launcher, and dmenu replacement for wayland and x11
1317213172
url = https://github.com/davatorium/rofi
1317313173
arch = any
13174+
depends = libglib2.0-0
13175+
depends = libpango-1.0-0
13176+
depends = libpangocairo-1.0-0
13177+
depends = libcairo2
13178+
depends = libgdk-pixbuf-2.0-0
13179+
depends = libxkbcommon0
13180+
depends = libwayland-client0
13181+
depends = libwayland-cursor0
13182+
depends = libwayland-egl1
1317413183
depends = libcairo2
1317513184
depends = libgdk-pixbuf-2.0-0
1317613185
depends = libglib2.0-0>=2.72
@@ -13187,10 +13196,19 @@ pkgbase = rofi
1318713196
depends = libxcb1
1318813197
depends = libxkbcommon-x11-0
1318913198
depends = libxkbcommon0>=0.4.1
13190-
makedepends = bison
13199+
makedepends = gcc
13200+
makedepends = meson
13201+
makedepends = ninja-build
13202+
makedepends = pkg-config
1319113203
makedepends = flex>=2.5.39
13204+
makedepends = bison
13205+
makedepends = libwayland-dev
13206+
makedepends = libglib2.0-dev
13207+
makedepends = libpango1.0-dev
1319213208
makedepends = libcairo2-dev
1319313209
makedepends = libgdk-pixbuf-2.0-dev
13210+
makedepends = libxkbcommon-dev
13211+
makedepends = wayland-protocols
1319413212
makedepends = libglib2.0-dev
1319513213
makedepends = libpango1.0-dev
1319613214
makedepends = libstartup-notification0-dev
@@ -13203,37 +13221,19 @@ pkgbase = rofi
1320313221
makedepends = libxcb-xinerama0-dev
1320413222
makedepends = libxcb-xkb-dev
1320513223
makedepends = libxcb1-dev
13206-
makedepends = libxkbcommon-dev
1320713224
makedepends = libxkbcommon-x11-dev
13208-
makedepends = pandoc
1320913225
makedepends = pkg-config
13210-
checkdepends = check
13226+
conflicts = rofi-dev
13227+
replaces = rofi
13228+
replaces = rofi-x11
13229+
replaces = rofi-wayland
1321113230
license = MIT
1321213231
maintainer = Don Alfons <donnisnoni@outlook.com>
13213-
source = @rofi~1.7.9.1::https://github.com/davatorium/rofi/releases/download/1.7.9.1/rofi-1.7.9.1.tar.gz
13214-
sha256sums = bb2c0f073b4422acc51a3f97d05275a82464750a33d2f4b120e3d866bb7b9ae5
13232+
maintainer = aKqir24 <aKqir24@github.com>
13233+
source = https://github.com/davatorium/rofi/releases/download/2.0.0/rofi-2.0.0.tar.gz
13234+
sha256sums = f81659b175306ff487e35d88d6b36128e85a793bfb56b64fa22c62eb54c4abd0
1321513235

1321613236
pkgname = rofi
13217-
pkgdesc = A window switcher, application launcher, and dmenu replacement
13218-
depends = libcairo2
13219-
depends = libgdk-pixbuf-2.0-0
13220-
depends = libglib2.0-0>=2.72
13221-
depends = libpango-1.0-0>=1.50
13222-
depends = libpangocairo-1.0-0
13223-
depends = libstartup-notification0>=0.11
13224-
depends = libxcb-cursor0
13225-
depends = libxcb-ewmh2
13226-
depends = libxcb-icccm4
13227-
depends = libxcb-randr0
13228-
depends = libxcb-util1
13229-
depends = libxcb-xinerama0
13230-
depends = libxcb-xkb1
13231-
depends = libxcb1
13232-
depends = libxkbcommon-x11-0
13233-
depends = libxkbcommon0>=0.4.1
13234-
13235-
pkgname = rofi-dev
13236-
pkgdesc = Development files for rofi
1323713237
---
1323813238
pkgbase = rojo-bin
1323913239
gives = rojo

0 commit comments

Comments
 (0)