summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-05-03 19:55:05 +0100
committerdavidovski <david@davidovski.xyz>2022-05-03 19:55:05 +0100
commit50740393013cb5fde05318d917ac4b68c58fdfa9 (patch)
tree2394d57656a9cbdbe9b325e7d5f480de57ebce7a
parent606bc59d0f8f67815c6a717843835477d44db6b3 (diff)
added some packages for gimp and firefox
-rw-r--r--repo/devel/rustc.xibuild20
-rw-r--r--repo/media/lame.xibuild10
-rw-r--r--repo/media/opus.xibuild9
-rw-r--r--repo/system/networkmanager.xibuild2
-rw-r--r--repo/system/nss.xibuild2
-rw-r--r--repo/system/polkit.xibuild1
-rw-r--r--repo/util/graphviz.xibuild4
-rw-r--r--repo/util/openssh.xibuild5
-rw-r--r--repo/x11/xf86-video-nouveau.xibuild4
-rw-r--r--repo/x11/xrandr.xibuild1
-rw-r--r--wishlist.md16
11 files changed, 50 insertions, 24 deletions
diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild
index 049ecae..758dafe 100644
--- a/repo/devel/rustc.xibuild
+++ b/repo/devel/rustc.xibuild
@@ -1,7 +1,7 @@
#!/bin/sh
-MAKEDEPS="cmake llvm clang"
-DEPS="curl gcc libssh2 openssl"
+MAKEDEPS="cmake llvm clang llvm-ar"
+DEPS="curl libssh2 openssl"
PKG_VER=1.58.1
SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz
@@ -48,16 +48,16 @@ build () {
--set="target.$target.llvm-config=/usr/bin/llvm-config" \
--set="target.$target.musl-root=/usr" \
--set="target.$target.crt-static=false" \
- --set="target.$target.cc=gcc" \
- --set="target.$target.cxx=c++" \
- --set="target.$target.ar=ar" \
- --set="target.$target.linker=gcc" \
+ --set="target.$target.cc=clang" \
+ --set="target.$target.cxx=clang++" \
+ --set="target.$target.ar=llvm-ar" \
+ --set="target.$target.linker=clang" \
--set="target.$build.musl-root=/usr" \
--set="target.$build.crt-static=false" \
- --set="target.$build.cc=gcc" \
- --set="target.$build.cxx=c++" \
- --set="target.$build.ar=ar" \
- --set="target.$build.linker=gcc"
+ --set="target.$build.cc=clang" \
+ --set="target.$build.cxx=clang++" \
+ --set="target.$build.ar=llvm-ar" \
+ --set="target.$build.linker=clang"
sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
diff --git a/repo/media/lame.xibuild b/repo/media/lame.xibuild
index 6c2e2dc..311292b 100644
--- a/repo/media/lame.xibuild
+++ b/repo/media/lame.xibuild
@@ -9,6 +9,16 @@ DEPS="musl "
PKG_VER=3.100
SOURCE="https://downloads.sourceforge.net/project/lame/lame/$PKG_VER/lame-$PKG_VER.tar.gz"
+prepare () {
+ # fix for parallel builds
+ mkdir -p libmp3lame/i386/.libs
+
+ # fix for pic build with new nasm
+ sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h
+
+ aclocal && automake --force --add-missing
+}
+
build () {
./configure \
--prefix=/usr
diff --git a/repo/media/opus.xibuild b/repo/media/opus.xibuild
index d8cc647..bb254e2 100644
--- a/repo/media/opus.xibuild
+++ b/repo/media/opus.xibuild
@@ -10,8 +10,13 @@ SOURCE=https://archive.mozilla.org/pub/opus/opus-$PKG_VER.tar.gz
build () {
./configure --prefix=/usr \
- --disable-static \
- --docdir=/usr/share/doc/opus-$PKG_VER &&
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --localstatedir=/var \
+ --enable-custom-modes
+
make
}
diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild
index 05fd136..910b601 100644
--- a/repo/system/networkmanager.xibuild
+++ b/repo/system/networkmanager.xibuild
@@ -3,7 +3,7 @@
MAKEDEPS="grep meson ninja python intltool glib"
DEPS="libndp curl wpa_supplicant newt nss polkit libpsl dbus gobject-introspection dhcp eudev libintl modemmanager nspr mobile-broadband-provider-info python-gobject"
-PKG_VER=1.35.5
+PKG_VER=1.39.2
SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz
ADDITIONAL="
diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild
index 2da465a..07aa866 100644
--- a/repo/system/nss.xibuild
+++ b/repo/system/nss.xibuild
@@ -1,7 +1,7 @@
#!/bin/sh
MAKEDEPS="make gyp perl mercurial python patch"
-DEPS="nspr libp11-kit sh zlib"
+DEPS="nspr libp11-kit sh zlib sqlite3"
PKG_VER=3.74
diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild
index de414cc..eb236bc 100644
--- a/repo/system/polkit.xibuild
+++ b/repo/system/polkit.xibuild
@@ -54,4 +54,5 @@ postinstall() {
/usr/sbin/groupadd -fg 27 polkitd &&
/usr/sbin/useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
-g polkitd -s /bin/false polkitd
+ true
}
diff --git a/repo/util/graphviz.xibuild b/repo/util/graphviz.xibuild
index 1a701b2..cc87d95 100644
--- a/repo/util/graphviz.xibuild
+++ b/repo/util/graphviz.xibuild
@@ -58,3 +58,7 @@ package () {
"$PKG_DEST"/usr/share/doc/graphviz
}
+
+postinstall () {
+ dot -c
+}
diff --git a/repo/util/openssh.xibuild b/repo/util/openssh.xibuild
index 1430347..869bcb9 100644
--- a/repo/util/openssh.xibuild
+++ b/repo/util/openssh.xibuild
@@ -34,3 +34,8 @@ package () {
install -Dm755 sshd.initd $PKG_DEST/etc/init.d/sshd
install -Dm755 sshd.confd $PKG_DEST/etc/conf.d/sshd
}
+
+postinstall () {
+ groupadd -g 33 sshd
+ useradd -u 33 -g 33 -c sshd -d / sshd
+}
diff --git a/repo/x11/xf86-video-nouveau.xibuild b/repo/x11/xf86-video-nouveau.xibuild
index 7e276a9..e2f593c 100644
--- a/repo/x11/xf86-video-nouveau.xibuild
+++ b/repo/x11/xf86-video-nouveau.xibuild
@@ -7,9 +7,10 @@ DESC="X.org nouveau video driver"
PKG_VER=1.0.17
SOURCE=https://www.x.org/pub/individual/driver/xf86-video-nouveau-$PKG_VER.tar.bz2
+ADDITIONAL="xorg-server-21.1.patch"
prepare () {
- ggrep -rl slave | xargs sed -i s/slave/secondary/
+ apply_patches
}
build () {
@@ -20,3 +21,4 @@ build () {
package () {
make DESTDIR=$PKG_DEST install
}
+
diff --git a/repo/x11/xrandr.xibuild b/repo/x11/xrandr.xibuild
index d8f67e1..49f8a8d 100644
--- a/repo/x11/xrandr.xibuild
+++ b/repo/x11/xrandr.xibuild
@@ -14,5 +14,4 @@ build () {
package () {
make DESTDIR=$PKG_DEST install
rm -f $PKG_DEST$XORG_PREFIX/bin/xkeystone
-
}
diff --git a/wishlist.md b/wishlist.md
index 6da19db..3a5c325 100644
--- a/wishlist.md
+++ b/wishlist.md
@@ -3,32 +3,32 @@
[x] bspwm
[x] sxhkd
[?] picom
-[?] mpd
-[?] ncmpcpp
-[?] pulsemixer
+[x] mpd
+[x] ncmpcpp
+[x] pulsemixer
[ ] pavucontrol
-[ ] chromium
+[?] chromium
[ ] firefox
[x] ffmpeg
[x] dmenu
[x] rofi
[x] mpv
[ ] sxiv
-[?] feh
+[x] feh
[ ] gimp
[ ] lmms
[ ] ardour
[ ] cava
-[ ] pcmanfm
+[x] pcmanfm
[ ] thunar
[ ] zathura
-[ ] polybar
+[x] polybar
[ ] gnu screen
[ ] tmux
[ ] ImageMagick
[x] nmap
-[ ] exiftool
+[x] exiftool
[x] mpc
[-] nvidia drivers (LLLLL)