diff --git a/astronaut/astronaut b/astronaut/astronaut index 53abea9..972c468 100755 --- a/astronaut/astronaut +++ b/astronaut/astronaut @@ -161,7 +161,7 @@ safe_sed() { download() { mkdir -p "$dir_source/$name" - local filename="$(basename "$1" | cut -d? -f1)" + local filename="$(basename $(echo "$1" | cut -d? -f1))" local path="$dir_source/$name/$filename" [ "$2" -a -f "$path" ] && local checksum="$(_mksum "$path")" @@ -197,12 +197,12 @@ extrafile() { dlextract() { download "$1" "$2" - extract "$(basename "$1" | cut -d? -f1)" + extract "$(basename $(echo "$1" | cut -d? -f1))" } dlfile() { download "$1" "$2" - getfile "$(basename "$1" | cut -d? -f1)" + getfile "$(basename $(echo "$1" | cut -d? -f1))" } option() { diff --git a/astronaut/freshnaut b/astronaut/freshnaut index a337621..59cb07e 100755 --- a/astronaut/freshnaut +++ b/astronaut/freshnaut @@ -69,12 +69,14 @@ function get_available_versions(satellite) return end + io.write("\x1B[1K\r" .. satellite .. ": Downloading update file...") local update_file = download(update_url) if not update_file then - print("WARNING: " .. satellite .. ": Failed to download " .. update_url) + print("\x1B[1K\rWARNING: " .. satellite .. ": Failed to download " .. update_url) return end + io.write("\x1B[1K\r" .. satellite .. ": Getting available versions...") -- Try getting variable update_names, get downloads otherwise. local update_names = astrohelp(satellite, "variable update_names") if not update_names then @@ -90,8 +92,6 @@ function get_available_versions(satellite) local versions = {} local count = 0 for update_name in update_names:gmatch("[^,]+") do - assert(update_name:match(version), "Invalid update name " .. update_name .. " does not contain " .. version) - local loop_regex, end_regex = make_regex(update_name, version) for x in update_file:gmatch(loop_regex) do @@ -110,10 +110,10 @@ function get_available_versions(satellite) end if count < 1 then - print("WARNING: " .. satellite .. ": Couldn't retrieve any versions") + print("\x1B[1K\rWARNING: " .. satellite .. ": Couldn't retrieve any versions") return elseif not versions[version] then - print("WARNING: " .. satellite .. ": Current version isn't available") + print("\x1B[1K\rWARNING: " .. satellite .. ": Current version isn't available") end return versions @@ -140,7 +140,7 @@ function check_new_versions(satellite, version_file_path) old_versions[version] = true end else - print(satellite .. ": First check") + print("\x1B[1K\r" .. satellite .. ": First check") version_file = io.open(version_file_path, "w") assert(version_file, "Failed to create " .. version_file_path) end @@ -148,11 +148,11 @@ function check_new_versions(satellite, version_file_path) for version, _ in pairs(versions) do if old_versions then if not old_versions[version] then - print(satellite .. ": " .. version) + print("\x1B[1K\r" .. satellite .. ": " .. version) version_file:write(version .. "\n") end else - print(satellite .. ": " .. version) + print("\x1B[1K\r" .. satellite .. ": " .. version) version_file:write(version .. "\n") end end @@ -172,16 +172,29 @@ elseif arg[1] == "dir" then local version_dir = arg[3] assert(os.execute("mkdir -p " .. version_dir), "Failed to create " .. version_dir) - local find = io.popen("find " .. satellite_dir .. " -type f -name '*.sat' -printf '%P\n'") + local find = call("find " .. satellite_dir .. " -type f -name '*.sat' -printf '%P\n'") assert(find, "Failed to run find") - for satellite in find:lines() do - local version_file = version_dir .. "/" .. satellite - if os.execute("mkdir -p " .. version_file:match("^.+/")) then - check_new_versions(satellite, version_file) - else - print("Failed to create dir for " .. satellite) + local total = select(2, find:gsub("\n", "\n")) + local cols = call("tput cols") + local count = 1 + + for satellite in find:gmatch("(.-)\n") do + if cols then + cols = tonumber(cols) + local countstr = tostring(count) .. "/" .. tostring(total) + io.write("\r") + for i = 1, cols - countstr:len() - 1 do + io.write(" ") + end + io.write(countstr .. "\r") end + + local version_file = version_dir .. "/" .. satellite + assert(os.execute("mkdir -p " .. version_file:match("^.+/")), "Failed to create dir for " .. satellite) + check_new_versions(satellite, version_file) + + count = count + 1 end else show_help() diff --git a/graveyard/unmaintained_satellites/bin/extrafiles/devkitarm/devkitarm.sh b/graveyard/unmaintained_satellites/bin/extrafiles/devkitarm/devkitarm.sh deleted file mode 100644 index a046dda..0000000 --- a/graveyard/unmaintained_satellites/bin/extrafiles/devkitarm/devkitarm.sh +++ /dev/null @@ -1,3 +0,0 @@ -export DEVKITPRO="%PREFIX%/opt/devkitPRO" -export DEVKITARM="$DEVKITPRO/devkitARM" -export PATH="$DEVKITARM/bin:$PATH" diff --git a/graveyard/unmaintained_satellites/bin/palemoon.sat b/graveyard/unmaintained_satellites/bin/palemoon.sat deleted file mode 100644 index 4ee02d8..0000000 --- a/graveyard/unmaintained_satellites/bin/palemoon.sat +++ /dev/null @@ -1,24 +0,0 @@ -name=palemoon -version=26.3.3 -update_url="https://linux.palemoon.org/download/mainline/" - -download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x86_64.tar.bz2" \ - "a081f6e0e27d39d9359a70539345bf9a" -extrafile "palemoon.desktop" -header_end - -mkdir -p "$dir_install/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \ - "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps" \ - "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps" \ - "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps" \ - "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \ - -extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/opt" -ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name" -ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png" -ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png" -ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default48.png" "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps/$name.png" -ln -s "$dir_sysroot/opt/$name/browser/icons/mozicon128.png" "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps/$name.png" -cp "palemoon.desktop" "$dir_install/$dir_prefix/share/applications/palemoon.desktop" - -# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/bin/unetbootin.sat b/graveyard/unmaintained_satellites/bin/unetbootin.sat deleted file mode 100644 index 267185c..0000000 --- a/graveyard/unmaintained_satellites/bin/unetbootin.sat +++ /dev/null @@ -1,11 +0,0 @@ -name=unetbootin -version=625 -update_url="https://unetbootin.github.io/linux_download.html" - -dlfile "https://launchpad.net/$name/trunk/$version/+download/$name-linux64-$version.bin" \ - "9b917957fbc21daf3abd5273c0544d93" -header_end - -install -D $name-linux64-$version.bin "$dir_install/$dir_prefix/bin/$name" - -# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/vcs/radare2-git.sat b/graveyard/unmaintained_satellites/vcs/radare2-git.sat deleted file mode 100644 index fcca254..0000000 --- a/graveyard/unmaintained_satellites/vcs/radare2-git.sat +++ /dev/null @@ -1,15 +0,0 @@ -# Using radare's own version of capstone-next, because they patch it and such. - -import "vcs/git" -import "compile/configure" - -name=radare2 - -vcs_git "https://github.com/radare/$name" -header_end - -cd "$name" - -compile_configure --with-syszip --with-sysmagic - -# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/vcs/armips.sat b/satellites/armips-git.sat similarity index 51% rename from graveyard/unmaintained_satellites/vcs/armips.sat rename to satellites/armips-git.sat index 67edc31..52bf70c 100644 --- a/graveyard/unmaintained_satellites/vcs/armips.sat +++ b/satellites/armips-git.sat @@ -1,5 +1,5 @@ -import "vcs/git" -import "compile/cmake" +import 'vcs/git' +import 'compile/cmake' name=armips @@ -7,6 +7,7 @@ vcs_git "https://github.com/Kingcom/$name" header_end cd "$name" -compile_cmake_installbin "$name" +compile_cmake -I +install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/confuse.sat b/satellites/confuse.sat new file mode 100644 index 0000000..d418bbb --- /dev/null +++ b/satellites/confuse.sat @@ -0,0 +1,14 @@ +import 'compile/configure' + +name=confuse +version=3.0 +update_url="https://github.com/martinh/lib$name/releases" + +dlextract "https://github.com/martinh/lib$name/releases/download/v$version/$name-$version.tar.xz" \ + 'c534b51a2118ed57031dc548032304a3' +header_end + +cd "$name-$version" +compile_configure -- --disable-static + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/bin/ctrulib.sat b/satellites/ctrulib-bin.sat similarity index 62% rename from graveyard/unmaintained_satellites/bin/ctrulib.sat rename to satellites/ctrulib-bin.sat index e36d0ea..2cc6327 100644 --- a/graveyard/unmaintained_satellites/bin/ctrulib.sat +++ b/satellites/ctrulib-bin.sat @@ -5,10 +5,10 @@ update_url="https://sourceforge.net/projects/devkitpro/files/$libname/" update_names="" download "https://sourceforge.net/projects/devkitpro/files/$libname/$version/$libname-$version.tar.bz2" \ - "9c65ae1f9474a03a727d346c6507d4b4" + '9c65ae1f9474a03a727d346c6507d4b4' header_end -mkdir -p "$dir_install/opt/devkitPRO/$libname" -extract "$libname-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname" +mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname" +extract "$libname-$version.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname" # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/vcs/ctrulib-git.sat b/satellites/ctrulib-git.sat similarity index 60% rename from graveyard/unmaintained_satellites/vcs/ctrulib-git.sat rename to satellites/ctrulib-git.sat index 60796e2..ebede2a 100644 --- a/graveyard/unmaintained_satellites/vcs/ctrulib-git.sat +++ b/satellites/ctrulib-git.sat @@ -1,4 +1,4 @@ -import "vcs/git" +import 'vcs/git' name=ctrulib @@ -6,6 +6,6 @@ vcs_git "https://github.com/smealum/$name" header_end cd "$name/libctru" -make DEVKITPRO="$dir_install/opt/devkitPRO" install +make DEVKITPRO="$dir_install/$dir_prefix/$dir_libdir/devkitPRO" install # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/bin/devkitarm.sat b/satellites/devkitarm-bin.sat similarity index 53% rename from graveyard/unmaintained_satellites/bin/devkitarm.sat rename to satellites/devkitarm-bin.sat index e7db596..9e707d7 100644 --- a/graveyard/unmaintained_satellites/bin/devkitarm.sat +++ b/satellites/devkitarm-bin.sat @@ -4,13 +4,13 @@ update_url="https://sourceforge.net/projects/devkitpro/files/$name/" update_names="/$name/${name}_$version/" download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$version/${name}_$version-x86_64-linux.tar.bz2" \ - "660dd47bae0e4b70a0a649b4bc833e33" -extrafile "devkitarm.sh" + '660dd47bae0e4b70a0a649b4bc833e33' +extrafile 'devkitarm.sh' header_end -mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO" -extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO" -sed -i -e "s@%PREFIX%@$dir_sysroot@g" devkitarm.sh -install -Dm644 devkitarm.sh "$dir_install/$dir_sysroot/etc/profile.d/devkitarm.sh" +mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO" +extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO" +sed -i -e "s/%DEVKITPRO%/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_libdir/devkitPRO")/g" devkitarm.sh +install -Dm755 -t "$dir_install/$dir_sysconfdir/profile.d/" devkitarm.sh # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/extrafiles/devkitARM/devkitarm.sh b/satellites/extrafiles/devkitARM/devkitarm.sh new file mode 100644 index 0000000..20eaf9b --- /dev/null +++ b/satellites/extrafiles/devkitARM/devkitarm.sh @@ -0,0 +1,3 @@ +export DEVKITPRO='%DEVKITPRO%' +export DEVKITARM="$DEVKITPRO/devkitARM" +export PATH="$PATH:$DEVKITARM/bin" diff --git a/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch b/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch new file mode 100644 index 0000000..b1297a0 --- /dev/null +++ b/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch @@ -0,0 +1,46 @@ ++++ Makefile +@@ -12,6 +12,10 @@ + endif + endif + ++ifndef WITH_PULSEAUDIO ++ WITH_PULSEAUDIO=yes ++endif ++ + CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare + CFLAGS+=-g + CFLAGS+=-std=gnu99 +@@ -21,8 +25,8 @@ + CFLAGS+=-Iinclude + LIBS+=-lconfuse + LIBS+=-lyajl +-LIBS+=-lpulse + LIBS+=-lm ++LIBS+=-lpulse + + VERSION=2.10 + GIT_VERSION="2.10 (2016-01-01)" +@@ -75,6 +79,13 @@ + LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread + endif + ++ifeq ($(WITH_PULSEAUDIO),yes) ++CFLAGS+=-DWITH_PULSEAUDIO ++else ++OBJS:=$(filter-out src/pulse.o, $(OBJS)) ++LIBS:=$(filter-out -lpulse, $(LIBS)) ++endif ++ + src/%.o: src/%.c include/i3status.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + @echo " CC $<" ++++ src/print_volume.c +@@ -60,7 +60,7 @@ + free(instance); + } + +-#ifndef __OpenBSD__ ++#if !defined(__OpenBSD__) && defined(WITH_PULSEAUDIO) + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the diff --git a/satellites/extrafiles/palemoon/palemoon.desktop b/satellites/extrafiles/palemoon/palemoon.desktop new file mode 100644 index 0000000..2538f46 --- /dev/null +++ b/satellites/extrafiles/palemoon/palemoon.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Pale Moon Web Browser +Comment=Browse the World Wide Web +Keywords=Internet;WWW;Browser;Web;Explorer +Exec=palemoon %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=palemoon +Categories=Network;WebBrowser;Internet +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; +StartupNotify=true diff --git a/satellites/functions/compile/cmake.sh b/satellites/functions/compile/cmake.sh index 1162c4f..08d0d40 100644 --- a/satellites/functions/compile/cmake.sh +++ b/satellites/functions/compile/cmake.sh @@ -1,16 +1,29 @@ -compile_cmake_base() { - mkdir -p build; cd build - cmake -DCMAKE_INSTALL_PREFIX="/$dir_prefix" -DCMAKE_BUILD_TYPE=Release $@ .. - make -} - compile_cmake() { - compile_cmake_base $@ - make DESTDIR="$dir_install" install -} + local noinstall=false + + local OPTIND=1 + local opt + while getopts "I" opt; do case "$opt" in + I) local noinstall=true ;; + esac; done + shift $((OPTIND-1)) -compile_cmake_installbin() { - local file="$1"; shift - compile_cmake_base $@ - install -D "$file" "$dir_install/$dir_prefix/bin/$file" + mkdir -p build; cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="/$dir_prefix" \ + -DCMAKE_INSTALL_SYSCONFDIR="$dir_sysconfdir" \ + -DCMAKE_INSTALL_BINDIR="$dir_bindir" \ + -DCMAKE_INSTALL_SBINDIR="$dir_sbindir" \ + -DCMAKE_INSTALL_LIBDIR="$dir_libdir" \ + -DCMAKE_INSTALL_LIBEXECDIR="$dir_libexecdir" \ + -DCMAKE_INSTALL_DATADIR="$dir_datadir" \ + -DCMAKE_INSTALL_MANDIR="$dir_mandir" \ + -DCMAKE_INSTALL_DOCDIR="$dir_docdir" \ + -DCMAKE_INSTALL_INFODIR="$dir_infodir" \ + -DCMAKE_INSTALL_LOCALEDIR="$dir_localedir" \ + $@ + make + [ "$noinstall" = false ] && make DESTDIR="$dir_install" install + true } diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh index bb2933b..9454130 100644 --- a/satellites/functions/compile/configure.sh +++ b/satellites/functions/compile/configure.sh @@ -44,5 +44,6 @@ compile_configure() { make $makeflags [ "$noinstall" = false ] && make DESTDIR="$dir_install" $makeflags install - [ "$builddir" ] && cd "$olddir" || true + [ "$builddir" ] && cd "$olddir" + true } diff --git a/satellites/i3.sat b/satellites/i3.sat new file mode 100644 index 0000000..f75dd09 --- /dev/null +++ b/satellites/i3.sat @@ -0,0 +1,27 @@ +name=i3 +version=4.12 +update_url='http://i3wm.org/downloads/' + +dlextract "http://i3wm.org/downloads/$name-$version.tar.bz2" \ + '308fc79ed252e1f3c8a093598e13e326' +header_end + +cd "$name-$version" + +# Fix install directories +sed -i -e "/\$(INSTALL)/s/bin/$(safe_sed "$dir_bindir")/" \ + -e "/\$(INSTALL)/s/share/$(safe_sed "$dir_datadir")/" \ + src/i3.mk i3-msg/i3-msg.mk i3-nagbar/i3-nagbar.mk \ + i3-config-wizard/i3-config-wizard.mk i3bar/i3bar.mk \ + i3-dump-log/i3-dump-log.mk i3-input/i3-input.mk + +make +make -C man +make install \ + PREFIX="/$dir_prefix" \ + SYSCONFDIR="/$dir_sysconfdir" \ + DESTDIR="$dir_install" + +install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" man/*.1 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/i3status.sat b/satellites/i3status.sat new file mode 100644 index 0000000..5ba910c --- /dev/null +++ b/satellites/i3status.sat @@ -0,0 +1,26 @@ +name=i3status +version=2.10 +update_url="https://i3wm.org/$name/" + +define_option 'pulseaudio: Add pulseaudio support' + +dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \ + '1121f7c1c193c873982aba22668398ef' +extrafile "$name-$version-optional-pulseaudio.patch" +header_end + +cd "$name-$version" + +patch -p0 -i "../$name-$version-optional-pulseaudio.patch" + +# Fix install directories +sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bindir")/" \ + -e "/install -m/s/share\/man/$(safe_sed "$dir_mandir")/" Makefile + +make WITH_PULSEAUDIO=$(option pulseaudio && echo yes || echo no) +make install \ + PREFIX="/$dir_prefix" \ + SYSCONFDIR="/$dir_sysconfdir" \ + DESTDIR="$dir_install" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/intel-ucode.sat b/satellites/intel-ucode.sat new file mode 100644 index 0000000..7b03f9c --- /dev/null +++ b/satellites/intel-ucode.sat @@ -0,0 +1,17 @@ +name=intel-ucode +version=20160714 + +dlextract "https://downloadmirror.intel.com/26156/eng/microcode-$version.tgz" \ + '84e4c0530dc38fd7b804daf894b1bdf9' +dlfile 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/intel-microcode2ucode.c?h=packages/intel-ucode' \ + '580276790cfc62dfd82b76085bd1e743' +header_end + +cc $CFLAGS -o intel-microcode2ucode intel-microcode2ucode.c +./intel-microcode2ucode ./microcode.dat + +install -Dm644 microcode.bin kernel/x86/microcode/GenuineIntel.bin +echo kernel/x86/microcode/GenuineIntel.bin | cpio -o -H newc -R 0:0 > intel-ucode.img +install -Dm644 -t "$dir_install/boot/" intel-ucode.img + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/libev.sat b/satellites/libev.sat new file mode 100644 index 0000000..19730dd --- /dev/null +++ b/satellites/libev.sat @@ -0,0 +1,18 @@ +import 'compile/configure' + +name=libev +version=4.22 +update_url="http://dist.schmorp.de/$name/" + +dlextract "http://dist.schmorp.de/$name/$name-$version.tar.gz" \ + 'bf0007e37240103d3c2be80ca9bee3f9' +header_end + +cd "$name-$version" + +# Don't install the libevent compatibility header, as it conflicts with the actual libevent. +sed -i -e '/include_HEADERS/s/event.h//' Makefile.in + +compile_configure + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/livestreamer.sat b/satellites/livestreamer.sat new file mode 100644 index 0000000..07ea26b --- /dev/null +++ b/satellites/livestreamer.sat @@ -0,0 +1,14 @@ +import 'compile/python' + +name=livestreamer +version=1.12.2 +update_url="https://pypi.python.org/pypi/$name" + +dlextract "https://pypi.python.org/packages/ee/d6/efbe3456160a2c62e3dd841c5d9504d071c94449a819148bb038b50d862a/$name-$version.tar.gz" \ + '63fb477bb3e28b7fe26b3cbba6f7937c' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/lua.sat b/satellites/lua.sat index a85273a..4be14e6 100644 --- a/satellites/lua.sat +++ b/satellites/lua.sat @@ -42,9 +42,9 @@ libs="-lm -Wl,-E -ldl -lreadline -lncurses" # Link the binary against the shared library rm "install/$dir_bindir/lua" -gcc src/lua.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/lua" +cc src/lua.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/lua" rm "install/$dir_bindir/luac" -gcc src/luac.o src/lopcodes.o src/ldump.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/luac" +cc src/luac.o src/lopcodes.o src/ldump.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/luac" # Actually install mkdir -p "$dir_install/$dir_prefix" diff --git a/satellites/palemoon-beta-bin.sat b/satellites/palemoon-beta-bin.sat new file mode 100644 index 0000000..4b699e7 --- /dev/null +++ b/satellites/palemoon-beta-bin.sat @@ -0,0 +1,30 @@ +name=palemoon +version=27.0.0a2 +update_url='http://www.palemoon.org/WIP/' + +download "http://relmirror.palemoon.org/beta/tycho/$name-$version.linux-x86_64.tar.bz2" \ + '073d3c946fc75b48443be6ec7a48685b' +extrafile "$name.desktop" +header_end + +# Install files +mkdir -p "$dir_install/$dir_prefix/$dir_libdir" +extract "$name-$version.linux-x86_64.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/" + +# Install executable +mkdir -p "$dir_install/$dir_prefix/$dir_bindir" +ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/$name" "$dir_install/$dir_prefix/$dir_bindir/$name" + +# Install icons +for x in 16 32 48; do + mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps" + ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/browser/chrome/icons/default/default$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png" +done +mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps" +ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/browser/icons/mozicon128.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/$name.png" + +# Install desktop file +mkdir -p "$dir_install/$dir_prefix/$dir_datadir/applications" +cp "$name.desktop" "$dir_install/$dir_prefix/share/applications/$name.desktop" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat new file mode 100644 index 0000000..3c238e2 --- /dev/null +++ b/satellites/palemoon-ublock.sat @@ -0,0 +1,12 @@ +name=uBlock +version=1.8.4 +update_url="https://github.com/gorhill/$name/releases" +update_names="/download/$version/" + +dlfile "https://github.com/gorhill/$name/releases/download/$version/${name}0.firefox.xpi" \ + '67cb1a423327183a326d64214d3b0882' +header_end + +install -Dm755 "${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/${name}0@raymondhill.net.xpi" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/palemoon-umatrix.sat b/satellites/palemoon-umatrix.sat new file mode 100644 index 0000000..89c5c45 --- /dev/null +++ b/satellites/palemoon-umatrix.sat @@ -0,0 +1,12 @@ +name=uMatrix +version=0.9.3.6 +update_url="https://github.com/gorhill/$name/releases" +update_names="/download/$version/" + +dlfile "https://github.com/gorhill/$name/releases/download/$version/$name.firefox.xpi" \ + '88e94db05a63c015927624875ed7655d' +header_end + +install -Dm755 "$name.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/$name@raymondhill.net.xpi" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/pdnsd.sat b/satellites/pdnsd.sat similarity index 79% rename from graveyard/unmaintained_satellites/pdnsd.sat rename to satellites/pdnsd.sat index b808106..53f317e 100644 --- a/graveyard/unmaintained_satellites/pdnsd.sat +++ b/satellites/pdnsd.sat @@ -1,11 +1,11 @@ -import "compile/configure" +import 'compile/configure' name=pdnsd version=1.2.9a update_url="http://members.home.nl/p.a.rombouts/$name/dl.html" dlextract "http://members.home.nl/p.a.rombouts/$name/releases/$name-$version-par.tar.gz" \ - "2f3e705d59a0f9308ad9504b24400769" + '2f3e705d59a0f9308ad9504b24400769' header_end cd "$name-$version" diff --git a/satellites/python3-qt5.sat b/satellites/python3-qt5.sat index b7498a1..fdb9023 100644 --- a/satellites/python3-qt5.sat +++ b/satellites/python3-qt5.sat @@ -2,11 +2,11 @@ import 'compile/python' import 'compile/qt' name=PyQt5 -version=5.6 +version=5.7 update_url='https://www.riverbankcomputing.com/software/pyqt/download5' dlextract "http://sourceforge.net/projects/pyqt/files/$name/PyQt-$version/${name}_gpl-$version.tar.gz" \ - 'dbfc885c0548e024ba5260c4f44e0481' + 'e3dc21f31fd714659f0688e1eb31bacf' header_end cd "${name}_gpl-$version" diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat new file mode 100644 index 0000000..be17ea6 --- /dev/null +++ b/satellites/python3-requests.sat @@ -0,0 +1,14 @@ +import 'compile/python' + +name=requests +version=2.11.0 +update_url="https://github.com/kennethreitz/$name/releases" + +dlextract "https://github.com/kennethreitz/$name/archive/v$version.tar.gz" \ + '09de9d563cd43ee28a3c55fc308c71f0' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat index dff8316..0f7a719 100644 --- a/satellites/python3-setuptools.sat +++ b/satellites/python3-setuptools.sat @@ -1,15 +1,19 @@ import 'compile/python' name=setuptools -version=25.1.0 +version=25.2.0 update_url="https://pypi.python.org/pypi/$name" update_names="$name-$version.tar.gz#md5=" -dlextract "https://pypi.python.org/packages/17/ed/ea984f05dd29e7a1ffdee0eba8335b5c73903e2ca10915fbdb6e8c5084c7/$name-$version.tar.gz" \ - 'a4814dead37e74a86883c66f7d420d73' +dlextract "https://pypi.python.org/packages/9f/32/81c324675725d78e7f6da777483a3453611a427db0145dfb878940469692/$name-$version.tar.gz" \ + 'a0dbb65889c46214c691f6c516cf959c' header_end cd "$name-$version" + +# Don't install the regular easy_install, as it conflicts with python 2 +sed -i -e '/easy_install =/d' setup.py + compile_python 3 # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/python3-sip.sat b/satellites/python3-sip.sat index 6a234f7..e91c113 100644 --- a/satellites/python3-sip.sat +++ b/satellites/python3-sip.sat @@ -1,15 +1,15 @@ import 'compile/python' name=sip -version=4.18 +version=4.18.1 update_url="https://www.riverbankcomputing.com/software/$name/download" dlextract "http://sourceforge.net/projects/pyqt/files/$name/$name-$version/$name-$version.tar.gz" \ - '78724bf2a79878201c3bc81a1d8248ea' + '9d664c33e8d0eabf1238a7ff44a399e9' header_end cd "$name-$version" -python3 configure.py CFLAGS="$CFLAGS" LFLAGS="$LDFLAGS" +python3 configure.py CFLAGS="$CFLAGS" LFLAGS="$LDFLAGS" --no-tools make make DESTDIR="$dir_install" install diff --git a/satellites/python3.sat b/satellites/python3.sat index 3273fe7..9b688c0 100644 --- a/satellites/python3.sat +++ b/satellites/python3.sat @@ -4,20 +4,14 @@ name=Python version=3.5.2 update_url='https://www.python.org/downloads/' +define_option '2to3-symlink: Install the 2to3 symlink (it may conflict with python2)' + dlextract "https://www.python.org/ftp/python/$version/$name-$version.tar.xz" \ '8906efbacfcdc7c3c9198aeefafd159e' header_end cd "$name-$version" -# Don't build the static library -sed -i -e '/$(BUILDPYTHON):/s/$(LIBRARY)//' \ - -e '/Programs\/_testembed:/s/$(LIBRARY)//' \ - -e '/test -d $(LIBRARY)/c\ @if false; then \\' Makefile.pre.in - -# Remove windows binaries and scripts -find Lib \( -name '*.exe' -o -name '*.bat' \) -delete - # Fix paths sed -i -e "/os.path.join(prefix/s/lib/$(safe_sed "$dir_libdir")/" Lib/site.py sed -i -e "s/\/lib\/python/\/$(safe_sed "$dir_libdir")\/python/" \ @@ -27,6 +21,17 @@ sed -i -e "/lib_python =/s/lib\//$(safe_sed "$dir_libdir")\//" Modules/getpath.c sed -i -e "/SCRIPTDIR=/s/lib/$(safe_sed "$dir_libdir")/" Makefile.pre.in sed -i -e "/LIBPL=/s/lib/$(safe_sed "$dir_libdir")/" configure +# Remove windows binaries and scripts +find Lib \( -name '*.exe' -o -name '*.bat' \) -delete + +# Don't build the static library +sed -i -e '/$(BUILDPYTHON):/s/$(LIBRARY)//' \ + -e '/Programs\/_testembed:/s/$(LIBRARY)//' \ + -e '/test -d $(LIBRARY)/c\ @if false; then \\' Makefile.pre.in + +# Don't install the 2to3 symlink, as that conflicts with python 2 +sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in + compile_configure -- \ --enable-shared \ --with-threads \ diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat index c3d20bd..fec9068 100644 --- a/satellites/qbittorrent.sat +++ b/satellites/qbittorrent.sat @@ -4,7 +4,7 @@ name=qbittorrent version=3.3.6 update_url='http://www.qbittorrent.org/download.php' -define_option 'qt4: Build for Qt4 instead of Qt5' +define_option '!qt4: Build for Qt4 instead of Qt5' dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \ '246195ff8a5e44be8ecfcc8a7c01b5a9' @@ -13,7 +13,7 @@ header_end cd "$name-$version" compile_configure -I -- \ --with-qtsingleapplication=shipped \ - $(option qt4 && echo "--with-qt4 --with-qjson=shipped" || echo "--without-qt4") + $(option qt4 && echo '--with-qt4 --with-qjson=shipped' || echo '--without-qt4') make INSTALL_ROOT="$dir_install" install # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat index 0b80afd..fe98403 100644 --- a/satellites/qt5-base.sat +++ b/satellites/qt5-base.sat @@ -27,17 +27,17 @@ for opt in $optional_libraries; do option $opt && optional="$optional -system-$opt" || optional="$optional -no-$opt" done -# NOTE: Only double-conversion from Qt itself is used, as there's no recent stable version available, due to lack of maintenance (last I can find is 1.1.5 from 2014, but there's scripts to build 2.0.1, for example in AUR, yet there's no place to get the proper sources for that). +# NOTE: Only double-conversion from Qt itself is used, as there's no recent stable version available, due to lack of maintenance (last I can find is 1.1.5 from 2014, but there's scripts to build 2.0.1, for example in AUR, yet there's no proper place to get the sources for that). ./configure -v -confirm-license -opensource \ -prefix "/$dir_prefix" \ -libdir "/$dir_prefix/$dir_libdir" \ - -headerdir "/$dir_prefix/include/qt5" \ + -headerdir "/$dir_prefix/include/$name" \ -sysconfdir "/$dir_sysconfdir/xdg" \ - -datadir "/$dir_prefix/$dir_datadir/qt5" \ - -bindir "/$dir_prefix/$dir_libdir/qt5/bin" \ - -archdatadir "/$dir_prefix/$dir_libdir/qt5" \ - -docdir "/$dir_prefix/$dir_docdir/qt5" \ - -examplesdir "/$dir_prefix/$dir_docdir/qt5/examples" \ + -datadir "/$dir_prefix/$dir_datadir/$name" \ + -bindir "/$dir_prefix/$dir_libdir/$name/bin" \ + -archdatadir "/$dir_prefix/$dir_libdir/$name" \ + -docdir "/$dir_prefix/$dir_docdir/$name" \ + -examplesdir "/$dir_prefix/$dir_docdir/$name/examples" \ -system-sqlite \ -system-zlib \ -system-pcre \ @@ -52,8 +52,8 @@ make make INSTALL_ROOT="$dir_install" install mkdir -p "$dir_install/$dir_prefix/$dir_bindir" -for bin in "$dir_install/$dir_prefix/$dir_libdir/qt5/bin/"*; do - ln -s "../$dir_libdir/qt5/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-qt5" +for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do + ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name" done # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat index 595b410..6dc8d23 100644 --- a/satellites/qt5-tools.sat +++ b/satellites/qt5-tools.sat @@ -15,8 +15,8 @@ cd "qt$submodule-opensource-src-$version" compile_qt 5 mkdir -p "$dir_install/$dir_prefix/$dir_bindir" -for bin in "$dir_install/$dir_prefix/$dir_libdir/qt5/bin/"*; do - ln -s "../$dir_libdir/qt5/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-qt5" +for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do + ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name" done # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/qt5-webkit b/satellites/qt5-webkit new file mode 100644 index 0000000..15934d5 --- /dev/null +++ b/satellites/qt5-webkit @@ -0,0 +1,17 @@ +import 'compile/qt' + +name=qt5 +submodule=webkit +majver=5.7 +version=$majver.0 +update_url='https://www.qt.io/download-open-source/' +update_names="qt-everywhere-opensource-src-$version.tar.gz" + +dlextract "http://download.qt.io/community_releases/$majver/$version/qt$submodule-opensource-src-$version.tar.xz" \ + '9379b8829639645c184fa63532035098' +header_end + +cd "qt$submodule-opensource-src-$version" +compile_qt 5 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/qutebrowser.sat b/satellites/qutebrowser.sat index d6c9c8c..78f98cc 100644 --- a/satellites/qutebrowser.sat +++ b/satellites/qutebrowser.sat @@ -1,11 +1,11 @@ import 'compile/python' name=qutebrowser -version=0.7.0 +version=0.8.2 update_url="https://github.com/The-Compiler/$name/releases" dlextract "https://github.com/The-Compiler/$name/releases/download/v$version/$name-$version.tar.gz" \ - '8f9feba57eb648d4c5b832bddb741be4' + 'f94ab51ac577a1f2256ee81f6e40f254' header_end cd "$name-$version" diff --git a/satellites/radare2-git.sat b/satellites/radare2-git.sat new file mode 100644 index 0000000..450a9d4 --- /dev/null +++ b/satellites/radare2-git.sat @@ -0,0 +1,14 @@ +# Build with the included version of capstone due to it using a newer version and includes patches for it. + +import 'vcs/git' +import 'compile/configure' + +name=radare2 + +vcs_git "https://github.com/radare/$name" +header_end + +cd "$name" +compile_configure -- --with-syszip --with-sysmagic + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/rofi.sat b/satellites/rofi.sat new file mode 100644 index 0000000..9e089b6 --- /dev/null +++ b/satellites/rofi.sat @@ -0,0 +1,14 @@ +import 'compile/configure' + +name=rofi +version=1.2.0 +update_url="https://github.com/DaveDavenport/$name/releases" + +dlextract "https://github.com/DaveDavenport/$name/releases/download/$version/$name-$version.tar.xz" \ + '0d02312dc3c4e74898a398de4daf4022' +header_end + +cd "$name-$version" +compile_configure + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/rxvt-unicode.sat b/satellites/rxvt-unicode.sat similarity index 50% rename from graveyard/unmaintained_satellites/rxvt-unicode.sat rename to satellites/rxvt-unicode.sat index adddef7..45bcfc2 100644 --- a/graveyard/unmaintained_satellites/rxvt-unicode.sat +++ b/satellites/rxvt-unicode.sat @@ -1,14 +1,16 @@ -import "compile/configure" +import 'compile/configure' name=rxvt-unicode version=9.22 update_url="http://dist.schmorp.de/$name/" dlextract "http://dist.schmorp.de/$name/$name-$version.tar.bz2" \ - "93782dec27494eb079467dacf6e48185" + '93782dec27494eb079467dacf6e48185' header_end cd "$name-$version" -compile_configure --enable-everything --enable-256-color +export TERMINFO="$dir_install/$dir_prefix/$dir_datadir/terminfo" +mkdir -p "$TERMINFO" +compile_configure -- --enable-everything --enable-256-color # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/tlp.sat b/satellites/tlp.sat new file mode 100644 index 0000000..fd5135c --- /dev/null +++ b/satellites/tlp.sat @@ -0,0 +1,18 @@ +name=TLP +version=0.8 +update_url="https://github.com/linrunner/$name/releases" +update_names="/archive/$version.tar.gz" + +dlextract "https://github.com/linrunner/$name/archive/$version.tar.gz" \ + 'd53ef993ce96ccff904d6caad1f14006' +header_end + +cd "$name-$version" +make install-tlp \ + TLP_LIBDIR="/$dir_prefix/$dir_libdir" \ + TLP_SBIN="/$dir_prefix/$dir_sbindir" \ + TLP_BIN="/$dir_prefix/$dir_bindir" \ + TLP_NO_INIT=1 \ + DESTDIR="$dir_install" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/graveyard/unmaintained_satellites/webfs.sat b/satellites/webfs.sat similarity index 79% rename from graveyard/unmaintained_satellites/webfs.sat rename to satellites/webfs.sat index 767ebd0..1e1262f 100644 --- a/graveyard/unmaintained_satellites/webfs.sat +++ b/satellites/webfs.sat @@ -3,7 +3,7 @@ version=1.21 update_url="https://www.kraxel.org/releases/$name/" dlextract "https://www.kraxel.org/releases/$name/$name-$version.tar.gz" \ - "6dc125fe160479404147e7bbfc781dbc" + '6dc125fe160479404147e7bbfc781dbc' header_end cd "$name-$version" @@ -14,6 +14,6 @@ sed -i -e "s/echo -e/echo/g" mk/Autoconf.mk sed -i -e "s@/etc/mime.types@/dev/null@g" GNUmakefile make -install -Dm755 "${name}d" "$dir_install/$dir_prefix/bin/${name}d" +install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir/" "${name}d" # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/xcb-util-xrm.sat b/satellites/xcb-util-xrm.sat new file mode 100644 index 0000000..5e829b7 --- /dev/null +++ b/satellites/xcb-util-xrm.sat @@ -0,0 +1,14 @@ +import 'compile/configure' + +name=xcb-util-xrm +version=1.0 +update_url="https://github.com/Airblader/$name/releases" + +dlextract "https://github.com/Airblader/$name/releases/download/v$version/$name-$version.tar.bz2" \ + '31b5074f47d8072a81d2ffd1dae3ad57' +header_end + +cd "$name-$version" +compile_configure + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/yajl.sat b/satellites/yajl.sat new file mode 100644 index 0000000..412b221 --- /dev/null +++ b/satellites/yajl.sat @@ -0,0 +1,22 @@ +import 'compile/cmake' + +name=yajl +version=2.1.0 +update_url="https://github.com/lloyd/$name/releases" +update_names="/archive/$version.tar.gz" + +dlextract "https://github.com/lloyd/$name/archive/$version.tar.gz" \ + '6887e0ed7479d2549761a4d284d3ecb0' +header_end + +cd "$name-$version" + +# Fix install dirs +sed -i -e "s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \ + -e "/INSTALL(/s/share/$(safe_sed "$dir_datadir")/" src/CMakeLists.txt +sed -i -e "/INSTALL(/s/bin/$(safe_sed "$dir_bindir")/" \ + verify/CMakeLists.txt reformatter/CMakeLists.txt + +compile_cmake + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: