fix: even more package script cleanup

src/polkit/changes.md

@@ -1,2 +1,5 @@
+# 124
+Updated to a newer upstream release
+
 # 123
 First version

src/v4l-utils/pkg.sh

@@ -1,21 +1,25 @@
 NAME="v4l-utils"
 DESC="Series of utilities for media devices, allowing to handle the proprietary formats available at most webcams"
 VERSION="1.24.1"
-FILES=("https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-$VERSION.tar.bz2")
+
+FILES=("https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-${VERSION}.tar.bz2")
 HASHES=("8ba9c73c4319b6afab5fa4358edc43de")
+
 DEPENDS=(
-  "alsa-lib" "glu" "libjpeg-turbo"
+  "gcc-libs" "hicolor-icon-theme" "libjpeg-turbo"
-  "qt5" "sdl2"
+  "systemd" "alsa-lib" "qt5"
 )
+BUILD=("llvm" "doxygen" "meson")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.bz2
+  tar xf "${NAME}-${VERSION}.tar.bz2"
-  cd $NAME-$VERSION
+  cd "${NAME}-${VERSION}"
 
   ./configure --prefix=/usr   \
             --sysconfdir=/etc \
             --disable-static 
-  make && make DESTDIR="$ROOTDIR" install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }

src/vala/pkg.sh

@@ -1,16 +1,26 @@
 NAME="vala"
 DESC="New programming language that aims to bring modern programming language features to GNOME developers"
 VERSION="0.56.11"
-FILES=("https://download.gnome.org/sources/vala/0.56/vala-$VERSION.tar.xz")
+
+FILES=("https://download.gnome.org/sources/vala/0.56/vala-${VERSION}.tar.xz")
 HASHES=("7b4481fb52bbf73fcfedacbdab616eeb")
-DEPENDS=("glib" "dbus" "libxslt")
+
+DEPENDS=(
+  "bash" "gcc" "glib"
+  "glibc" "graphviz" "gtk-doc"
+  "pkgconf"
+)
+BUILD=("libxslt")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
+  tar xf "${NAME}-${VERSION}.tar.xz"
-  cd $NAME-$VERSION
+  cd "${NAME}-${VERSION}"
+
+  export CFLAGS+=" -std=gnu89 "
 
   ./configure --prefix=/usr
-  make && make DESTDIR="$ROOTDIR" install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }

src/vlc/pkg.sh

@@ -1,8 +1,10 @@
 NAME="vlc"
 DESC="A media player, streamer, and encoder"
 VERSION="3.0.18"
-FILES=("https://download.videolan.org/vlc/$VERSION/vlc-$VERSION.tar.xz")
+
+FILES=("https://download.videolan.org/vlc/${VERSION}/vlc-${VERSION}.tar.xz")
 HASHES=("f3c031357c0eeffb41e928eca220a803")
+
 DEPENDS=(
   "alsa-lib" "desktop-file-utils" "ffmpeg" "liba52"
   "libgcrypt" "libmad" "lua" "dbus" "libidn2" "libssh2"
@@ -16,18 +18,20 @@ DEPENDS=(
 )
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
+  tar xf "${NAME}-${VERSION}.tar.xz"
-  cd $NAME-$VERSION
+  cd "${NAME}-${VERSION}"
 
   export LUAC=/usr/bin/luac
   export LUA_LIBS="$(pkg-config --libs lua)"
   export CPPFLAGS="$(pkg-config --cflags lua)"
+  export CFLAGS+=" -std=gnu89 -Wno-incompatible-pointer-types "
 
   BUILDCC=gcc ./configure --prefix=/usr
-  make && make DESTDIR="$ROOTDIR" docdir=/usr/share/doc/vlc-$VERSION install
+  make
+  make DESTDIR="${ROOTDIR}" docdir=/usr/share/doc/vlc-${VERSION} install
 
   unset CPPFLAGS LUAC LUA_LIBS
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
 
 INSTALL(){

src/vte2/pkg.sh

@@ -1,18 +1,24 @@
 NAME="vte2"
 DESC="Termcap file implementation for terminal emulators"
 VERSION="0.28.2"
-FILES=("https://download.gnome.org/sources/vte/${VERSION%.*}/vte-$VERSION.tar.xz")
+
+FILES=("https://download.gnome.org/sources/vte/${VERSION%.*}/vte-${VERSION}.tar.xz")
 HASHES=("497f26e457308649e6ece32b3bb142ff")
-DEPENDS=("gtk2" "gobject-introspection")
+
+DEPENDS=("gtk2")
+BUILD=("gobject-introspection")
 
 PACKAGE() {
-  tar xf vte-$VERSION.tar.xz
+  tar xf "vte-${VERSION}.tar.xz"
-  cd vte-$VERSION
+  cd "vte-${VERSION}"
+
+  export CFLAGS+=" -std=gnu89 "
 
   ./configure --prefix=/usr           \
             --libexecdir=/usr/lib/vte \
             --disable-static
-  make && make DESTDIR="$ROOTDIR" install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r vte-$VERSION
+  cd .. && rm -r "vte-${VERSION}"
 }

src/xfce4-terminal/pkg.sh

@@ -1,16 +1,20 @@
 NAME="xfce4-terminal"
 DESC="Xfce4 Terminal is a GTK3 terminal emulator"
 VERSION="1.1.0"
-FILES=("https://archive.xfce.org/src/apps/xfce4-terminal/${VERSION%.*}/xfce4-terminal-$VERSION.tar.bz2")
+
+FILES=("https://archive.xfce.org/src/apps/xfce4-terminal/${VERSION%.*}/xfce4-terminal-${VERSION}.tar.bz2")
 HASHES=("ee9177be31c6e4ccc6a6f293158358e4")
-DEPENDS=("vte3" "libxfce4ui")
+
+DEPENDS=("vte3" "libxfce4ui" "hicolor-icon-theme")
+BUILD=("intltool")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.bz2
+  tar xf "${NAME}-${VERSION}.tar.bz2"
-  cd $NAME-$VERSION
+  cd "${NAME}-${VERSION}"
 
   ./configure --prefix=/usr
-  make && make DESTDIR="$ROOTDIR" install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }

src/xkbutils/pkg.sh

@@ -1,16 +1,25 @@
 NAME="xkbutils"
 DESC="XKB utility demos"
 VERSION="1.0.5"
-FILES=("https://www.x.org/pub/individual/app/xkbutils-$VERSION.tar.xz")
+
+FILES=("https://www.x.org/pub/individual/app/xkbutils-${VERSION}.tar.xz")
 HASHES=("cf65ca1aaf4c28772ca7993cfd122563")
-DEPENDS=("libx11" "libxaw" "libxt")
+
+DEPENDS=(
+  "glibc" "libx11" "libxaw"
+  "libxt"
+)
+BUILD=("xorgproto")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
+  tar xf "${NAME}-${VERSION}.tar.xz"
-  cd $NAME-$VERSION
+  cd "${NAME}-${VERSION}"
+
+  export CFLAGS+=" -std=gnu89 "
 
   ./configure $XORG_CONFIG
-  make && make DESTDIR=${ROOTDIR} install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -rf $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }