Enabled compositor by default in xfce/xfwm4

Added /usr to several xfce section build files
2024-11-01 22:31:37 +05:30 · 2024-11-01 22:31:37 +05:30 · 8f942da698
commit 8f942da698
parent 7a5814b69d
38 changed files with 55 additions and 54 deletions
--- a/xfce/exo/smbuild
+++ b/xfce/exo/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static 

  make
--- a/xfce/faenza-icon-theme/smbuild
+++ b/xfce/faenza-icon-theme/smbuild
@ -17,9 +17,9 @@ prepbuilddir() {
 }

 build() {
-  mkdir -p $pkg/share/icons
-  cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/share/icons/
-  cp -r emesene $pkg/share/
+  mkdir -p $pkg/usr/share/icons
+  cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/usr/share/icons/
+  cp -r emesene $pkg/usr/share/

  cp debian/copyright $pkgdocs/

--- a/xfce/garcon/smbuild
+++ b/xfce/garcon/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static 

  make
--- a/xfce/libxfce4ui/smbuild
+++ b/xfce/libxfce4ui/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static 

  make
--- a/xfce/libxfce4util/smbuild
+++ b/xfce/libxfce4util/smbuild
@ -18,8 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
-    --sbindir=/bin \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
    --disable-static 

  make
--- a/xfce/mousepad/smbuild
+++ b/xfce/mousepad/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" 
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/ristretto/smbuild
+++ b/xfce/ristretto/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/thunar-archive-plugin/smbuild
+++ b/xfce/thunar-archive-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static \

  make
--- a/xfce/thunar-volman/smbuild
+++ b/xfce/thunar-volman/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static 

  make
--- a/xfce/thunar/smbuild
+++ b/xfce/thunar/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --enable-gio-unix \
    --enable-gudev \
    --enable-exif \
--- a/xfce/tumbler/smbuild
+++ b/xfce/tumbler/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static 

  make
--- a/xfce/upower/smbuild
+++ b/xfce/upower/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static

  make
--- a/xfce/vte5/smbuild
+++ b/xfce/vte5/smbuild
@ -22,7 +22,7 @@ build() {
  mkdir -p smbuild && cd smbuild

  meson .. \
-    --prefix="/" \
+    --prefix=/usr \
    -D_systemd=false 

  ninja
--- a/xfce/xfce4-appfinder/smbuild
+++ b/xfce/xfce4-appfinder/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static 

  make
--- a/xfce/xfce4-cpugraph-plugin/smbuild
+++ b/xfce/xfce4-cpugraph-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-datetime-plugin/smbuild
+++ b/xfce/xfce4-datetime-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-dev-tools/smbuild
+++ b/xfce/xfce4-dev-tools/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static 

  make
--- a/xfce/xfce4-dict/smbuild
+++ b/xfce/xfce4-dict/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-diskperf-plugin/smbuild
+++ b/xfce/xfce4-diskperf-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-fsguard-plugin/smbuild
+++ b/xfce/xfce4-fsguard-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-netload-plugin/smbuild
+++ b/xfce/xfce4-netload-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-notifyd/smbuild
+++ b/xfce/xfce4-notifyd/smbuild
@ -20,7 +20,8 @@ build() {
  sed -e "s/^systemd_user_in_files =.*/systemd_user_in_files =/"  -i Makefile.in

  ./configure \
-    --prefix=""
+    --prefix=/usr \
+    --sysconfdir=/etc

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-panel/smbuild
+++ b/xfce/xfce4-panel/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static 

  make
@ -31,4 +32,4 @@ build() {

 sha512sums="
 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d  xfce4-panel-4.16.2.tar.bz2
-"
+"
--- a/xfce/xfce4-power-manager/smbuild
+++ b/xfce/xfce4-power-manager/smbuild
@ -18,7 +18,8 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-polkit \
    --disable-network-manager 

--- a/xfce/xfce4-screenshooter/smbuild
+++ b/xfce/xfce4-screenshooter/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static 

  make
--- a/xfce/xfce4-sensors-plugin/smbuild
+++ b/xfce/xfce4-sensors-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make 
  make install DESTDIR=$pkg
--- a/xfce/xfce4-session/smbuild
+++ b/xfce/xfce4-session/smbuild
@ -18,13 +18,14 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="/" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static \
    --disable-polkit \
    --disable-legacy-sm

  make
-  make install XSESSION_PREFIX="/" DESTDIR=$pkg
+  make install DESTDIR=$pkg

  mkfinalpkg
 }
--- a/xfce/xfce4-settings/smbuild
+++ b/xfce/xfce4-settings/smbuild
@ -20,7 +20,8 @@ build() {
  applypatch $srcdir/default-xsettings-xml.patch

  ./configure \
-    --prefix="" \
+    --prefix=/usr \
+    --sysconfdir=/etc \
    --disable-static \
    --enable-sound-settings \
    --enable-pluggable-dialogs \
--- a/xfce/xfce4-systemload-plugin/smbuild
+++ b/xfce/xfce4-systemload-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-taskmanager/smbuild
+++ b/xfce/xfce4-taskmanager/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-terminal/smbuild
+++ b/xfce/xfce4-terminal/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=""
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/xfce/xfce4-wavelan-plugin/smbuild
+++ b/xfce/xfce4-wavelan-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-weather-plugin/smbuild
+++ b/xfce/xfce4-weather-plugin/smbuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfce4-whiskermenu-plugin/smbuild
+++ b/xfce/xfce4-whiskermenu-plugin/smbuild
@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
  mkdir -p smbuild && cd smbuild
  cmake .. \
-    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_INSTALL_LIBDIR=lib

  make
--- a/xfce/xfconf/smbuild
+++ b/xfce/xfconf/smbuild
@ -19,7 +19,7 @@ prepbuilddir() {
 build() {

  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static

  make
--- a/xfce/xfdesktop/smbuild
+++ b/xfce/xfdesktop/smbuild
@ -19,7 +19,7 @@ prepbuilddir() {
 build() {

  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --enable-thunarx \
    --enable-notifications 

--- a/xfce/xfwm4-themes/smbuild
+++ b/xfce/xfwm4-themes/smbuild
@ -19,8 +19,8 @@ prepbuilddir() {
 build() {

  ./configure \
-    --prefix="" \
-    --libexecdir=/lib 
+    --prefix=/usr \
+    --libexecdir=/usr/libexec

  make
  make install DESTDIR=$pkg 
--- a/xfce/xfwm4/smbuild
+++ b/xfce/xfwm4/smbuild
@ -17,21 +17,12 @@ prepbuilddir() {
 }

 build() {
-
-  # Results in faster window draw and less CPU on the pi
-  if [ "$aarch" = "aarch64" ]; then
-    compositingflag="--disable-compositor" 
-  else
-    compositingflag="--enable-compositor"
-  fi
-
  ./configure \
-    --prefix="" \
+    --prefix=/usr \
    --disable-static \
    --enable-startup-notification \
    --enable-randr \
-    --enable-xsync \
-    $compositingflag 
+    --enable-xsync

  make
  make install DESTDIR=$pkg