diff --git a/LFSPkgBuildScripts/sys/libnotify/libnotify3.LFSBuild b/LFSPkgBuildScripts/sys/libnotify/libnotify3.LFSBuild index d16a01ed..ff6756cc 100755 --- a/LFSPkgBuildScripts/sys/libnotify/libnotify3.LFSBuild +++ b/LFSPkgBuildScripts/sys/libnotify/libnotify3.LFSBuild @@ -8,18 +8,18 @@ if ! lfspkg -B "$DEPENDS";then fi PKGNAME="libnotify3" -TARNAME="$PKGNAME" +TARNAME="libnotify" VERSION="0.7.8" BUILD=${BUILD:-1} SECTION="SYS" SUFFIX="LFSPKG" -TARBALL="${TARNAME}-${VERSION}.tar.gz" +TARBALL="${TARNAME}-${VERSION}.tar.xz" PKG="${OUTPUT}/${PKGNAME}" DOWHAT=${1:-"build"} CWD=$(pwd) scriptLog "${PKGNAME}-${VERSION}" -gettar "http://ftp.gnome.org/pub/gnome/sources/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION +gettar "http://ftp.gnome.org/pub/gnome/sources/${TARNAME}/${VERSION%.?*}/${TARBALL}" $SECTION rm -rf "$PKG" || true mkdir -p "$PKG" diff --git a/LFSPkgBuildScripts/xfce/Thunar/Thunar.LFSBuild b/LFSPkgBuildScripts/xfce/Thunar/Thunar.LFSBuild index 1e3eb5d4..fb897bab 100755 --- a/LFSPkgBuildScripts/xfce/Thunar/Thunar.LFSBuild +++ b/LFSPkgBuildScripts/xfce/Thunar/Thunar.LFSBuild @@ -7,8 +7,8 @@ if ! lfspkg -B "$DEPENDS";then exit 100 fi -PKGNAME="Thunar" -TARNAME="$PKGNAME" +PKGNAME="thunar" +TARNAME="Thunar" VERSION="1.8.9" BUILD=${BUILD:-1} SECTION="XFCE" diff --git a/LFSPkgBuildScripts/xfce/gtk-xfce-engine/gtk-xfce-engine.LFSBuild b/LFSPkgBuildScripts/xfce/gtk-xfce-engine/gtk-xfce-engine.LFSBuild index 0457f7ea..8b65dbda 100755 --- a/LFSPkgBuildScripts/xfce/gtk-xfce-engine/gtk-xfce-engine.LFSBuild +++ b/LFSPkgBuildScripts/xfce/gtk-xfce-engine/gtk-xfce-engine.LFSBuild @@ -19,7 +19,8 @@ DOWHAT=${1:-"build"} CWD=$(pwd) scriptLog "${PKGNAME}-${VERSION}" -gettar "https://archive.xfce.org/src/xfce/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION +gettar "https://archive.xfce.org/src/archive/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION + rm -rf "$PKG" || true mkdir -p "$PKG" diff --git a/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild b/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild index 94bf61d7..e2a86e94 100755 --- a/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild +++ b/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild @@ -19,18 +19,19 @@ DOWHAT=${1:-"build"} CWD=$(pwd) scriptLog "${PKGNAME}-${VERSION}" -gettar "http://ftp.gnome.org/pub/gnome/sources/libwnck/2.30/${TARBALL}" $SECTION +gettar "http://ftp.gnome.org/pub/gnome/sources/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION + rm -rf "$PKG" || true mkdir -p "$PKG" pushd $COMPILEAT 2>/dev/null||true extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}" pushd "${TARNAME}-${VERSION}" - mkdir build + mkdir -vp build cd build - meson --prefix=/usr -Dbuildtype=release -Dgtk_doc=true .. - ninja|| exit 100 - DESTDIR=$PKG ninja install|| exit 100 + meson --prefix=/usr -Dbuildtype=release .. + ninja $MAKEFLAGS||ninja -j1||exit 100 + DESTDIR=$PKG ninja install popd checketc $PKG diff --git a/LFSPkgBuildScripts/xfce/libxfcegui4/libxfcegui4.LFSBuild b/LFSPkgBuildScripts/xfce/libxfcegui4/libxfcegui4.LFSBuild index 1f592d15..5e4d8743 100755 --- a/LFSPkgBuildScripts/xfce/libxfcegui4/libxfcegui4.LFSBuild +++ b/LFSPkgBuildScripts/xfce/libxfcegui4/libxfcegui4.LFSBuild @@ -19,7 +19,7 @@ DOWHAT=${1:-"build"} CWD=$(pwd) scriptLog "${PKGNAME}-${VERSION}" -gettar "https://archive.xfce.org/src/xfce/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION +gettar "https://archive.xfce.org/src/archive/${PKGNAME}/${VERSION%.?*}/${TARBALL}" $SECTION rm -rf "$PKG" || true mkdir -p "$PKG"