From c22a8de3386975f19b2a6c490b9a52a3ee3bbba7 Mon Sep 17 00:00:00 2001 From: Phantop Date: Wed, 23 Dec 2020 15:43:55 -0500 Subject: [PATCH] Remove some packages that are in official repos Removes castor for sucking, starship for being included, dolphin-emu-git because Solus's is up-to-date --- .gitignore | 1 + build | 6 ++-- castor/files/castor-0.7.0-makefile.patch | 17 --------- castor/package.yml | 25 ------------- dolphin-emu-git/package.yml | 46 ------------------------ hid-nintendo/package.yml | 4 +-- joycond/package.yml | 2 -- list | 3 -- package.yml | 1 + packager | 3 -- starship/package.yml | 23 ------------ webp-pixbuf-loader/package.yml | 18 ++++++++++ 12 files changed, 26 insertions(+), 123 deletions(-) delete mode 100644 castor/files/castor-0.7.0-makefile.patch delete mode 100644 castor/package.yml delete mode 100644 dolphin-emu-git/package.yml delete mode 100644 packager delete mode 100644 starship/package.yml create mode 100644 webp-pixbuf-loader/package.yml diff --git a/.gitignore b/.gitignore index 08a18bf..a77d35e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.eopkg +packager pspec_x86_64.xml diff --git a/build b/build index 2ae9729..0dd85a0 100755 --- a/build +++ b/build @@ -1,16 +1,18 @@ #!/usr/bin/fish +set profile "-punstable-x86_64" function buildme echo Now building (basename $argv) cd $argv - sudo solbuild build package.yml -d + sudo solbuild build package.yml -d $profile sudo eopkg it --reinstall (basename $argv)*.eopkg cd .. end cd (dirname (realpath (status -f))) -sudo solbuild init +sudo solbuild init $profile +sudo solbuild update $profile if test "$argv" for i in $argv diff --git a/castor/files/castor-0.7.0-makefile.patch b/castor/files/castor-0.7.0-makefile.patch deleted file mode 100644 index ec585dd..0000000 --- a/castor/files/castor-0.7.0-makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ -Common subdirectories: castor/data and castor-makefile/data -Common subdirectories: castor/.git and castor-makefile/.git -diff -u castor/Makefile castor-makefile/Makefile ---- castor/Makefile 2020-04-24 23:57:59.119673418 +0200 -+++ castor-makefile/Makefile 2020-04-24 23:58:41.033151139 +0200 -@@ -29,8 +29,8 @@ - # Install the data files and update the caches - install-data : copy-data - # Force icon cache refresh -- touch $(sharedir)/icons/hicolor -- update-desktop-database -+ #touch $(sharedir)/icons/hicolor -+ #update-desktop-database - - # Just copy the data files, without updating caches - copy-data : -Common subdirectories: castor/src and castor-makefile/src diff --git a/castor/package.yml b/castor/package.yml deleted file mode 100644 index ff4c091..0000000 --- a/castor/package.yml +++ /dev/null @@ -1,25 +0,0 @@ -name : castor -version : 1 -release : 1 -source : - - git|https://git.sr.ht/~julienxx/castor : master -license : - - ISC -component : system.utils -networking : yes -summary : A Browser for the small internet (Gemini, Gopher, Finger) -description: | - A graphical client for plain-text protocols written in Rust with GTK. - It currently supports the Gemini, Gopher and Finger protocols. -builddeps : - - pkgconfig(atk) - - pkgconfig(gdk-pixbuf-2.0) - - pkgconfig(gtk+-3.0) - - pkgconfig(pango) - - cargo -setup : | - %patch -p1 < $pkgfiles/castor-0.7.0-makefile.patch -build : | - %make -install : | - %make_install diff --git a/dolphin-emu-git/package.yml b/dolphin-emu-git/package.yml deleted file mode 100644 index 381721a..0000000 --- a/dolphin-emu-git/package.yml +++ /dev/null @@ -1,46 +0,0 @@ -name : dolphin-emu-git -version : 5.0 -release : 1 -source : - - git|https://github.com/dolphin-emu/dolphin.git : master -license : GPL-2.0-or-later -component : games.emulator -summary : GameCube / Wii emulator -description: | - GameCube / Wii emulator, allowing you to play games for these two platforms on your PC. -builddeps : - - pkgconfig(Qt5Core) - - pkgconfig(alsa) - - pkgconfig(bluez) - - pkgconfig(gtk+-2.0) - - pkgconfig(libavcodec) - - pkgconfig(libcurl) - - pkgconfig(libenet) - - pkgconfig(libevdev) - - pkgconfig(libpulse) - - pkgconfig(libusb-1.0) - - pkgconfig(openal) - - pkgconfig(portaudio-2.0) - - pkgconfig(sdl2) - - pkgconfig(sfml-all) - - pkgconfig(soundtouch) - - pkgconfig(xi) - - pkgconfig(xrandr) - - gtest-devel - - llvm-clang-devel - - lzo-devel - - mbedtls-devel - - miniupnpc-devel -optimize : lto -setup : | - %cmake_ninja -DENABLE_QT=TRUE \ - -DDISTRIBUTOR='Solus' \ - -DUSE_SHARED_ENET=TRUE \ - -DUSE_SHARED_GTEST=TRUE . -build : | - %ninja_build -install : | - %ninja_install - - # Install udev rule - install -Dm00644 Data/51-usb-device.rules $installdir/%libdir%/udev/rules.d/51-usb-device.rules diff --git a/hid-nintendo/package.yml b/hid-nintendo/package.yml index 8880e0b..475f3bd 100644 --- a/hid-nintendo/package.yml +++ b/hid-nintendo/package.yml @@ -1,9 +1,9 @@ name : hid-nintendo -version : 2.0 +version : 3.0 release : 1 homepage : https://github.com/nicman23/dkms-hid-nintendo source : - - git|https://github.com/nicman23/dkms-hid-nintendo.git : 3fe4a5856999fed4d2cf8e9ff6553bbb69f3835c + - git|https://github.com/nicman23/dkms-hid-nintendo.git : master license : GPL-2.0-or-later summary : A kernel driver for the Nintendo Switch Pro Controllers and the Joy-Cons. description: | diff --git a/joycond/package.yml b/joycond/package.yml index dda2d1a..6b34535 100644 --- a/joycond/package.yml +++ b/joycond/package.yml @@ -10,8 +10,6 @@ description: | joycond is a linux daemon which uses the evdev devices provided by hid-nintendo (formerly known as hid-joycon) to implement joycon pairing. builddeps : - pkgconfig(libevdev) -rundeps : - - hid-nintendo setup : | %cmake build : | diff --git a/list b/list index 8c87a85..49f61e6 100644 --- a/list +++ b/list @@ -1,8 +1,5 @@ -dolphin-emu-git earlyoom hid-nintendo joycond mpv-mpris -ninfs torsocks -waifu2x diff --git a/package.yml b/package.yml index 658c994..deaa693 100644 --- a/package.yml +++ b/package.yml @@ -8,6 +8,7 @@ summary : Insert summary here description: | Insert description here builddeps : + - pkgconfig(example) setup : | %configure %cmake diff --git a/packager b/packager deleted file mode 100644 index bae4be2..0000000 --- a/packager +++ /dev/null @@ -1,3 +0,0 @@ -[Packager] -Name=phantop -Email=phantop@tuta.io diff --git a/starship/package.yml b/starship/package.yml deleted file mode 100644 index 0c434a5..0000000 --- a/starship/package.yml +++ /dev/null @@ -1,23 +0,0 @@ -name : starship -version : 0.47.0 -release : 1 -source : - - https://github.com/starship/starship/archive/v0.47.0.tar.gz : 9c9ede1eb7a9e1acf49f0321915232426c234b356c6bb1f740d15d6fa45d1bee -license : - - ISC -component : system.utils -networking : yes -summary : The minimal, blazing-fast, and infinitely customizable prompt for any shell! -description: | - Fast: it's fast – really really fast! rocket - Customizable: configure every aspect of your prompt. - Universal: works on any shell, on any operating system. - Intelligent: shows relevant information at a glance. - Feature rich: support for all your favorite tools. - Easy: quick to install – start using it in minutes. -builddeps : - - cargo -build : | - cargo build --release -install : | - install -Dm00755 target/release/starship $installdir/usr/bin/starship diff --git a/webp-pixbuf-loader/package.yml b/webp-pixbuf-loader/package.yml new file mode 100644 index 0000000..bc377d9 --- /dev/null +++ b/webp-pixbuf-loader/package.yml @@ -0,0 +1,18 @@ +name : webp-pixbuf-loader +version : 1 +release : 1 +source : + - git|https://github.com/aruiz/webp-pixbuf-loader.git : master +license : GPL-2.0-or-later +summary : Insert summary here +description: | + Insert description here +builddeps : + - pkgconfig(libwebp) + - pkgconfig(gdk-pixbuf-2.0) +setup : | + %meson_configure +build : | + %ninja_build +install : | + %ninja_install