[arch-commits] Commit in torrential/trunk (PKGBUILD no-unity.patch patch-vala.patch)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Feb 10 23:00:02 UTC 2022
Date: Thursday, February 10, 2022 @ 23:00:02
Author: arojas
Revision: 1131505
Update to 2.0.1
Modified:
torrential/trunk/PKGBUILD
Deleted:
torrential/trunk/no-unity.patch
torrential/trunk/patch-vala.patch
------------------+
PKGBUILD | 65 ++++++--------------------------------------
no-unity.patch | 77 -----------------------------------------------------
patch-vala.patch | 13 --------
3 files changed, 10 insertions(+), 145 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-10 22:48:52 UTC (rev 1131504)
+++ PKGBUILD 2022-02-10 23:00:02 UTC (rev 1131505)
@@ -1,35 +1,17 @@
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=torrential
-pkgver=1.1.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=1
pkgdesc='Simple BitTorrent client for Pantheon'
arch=('x86_64')
url='https://github.com/davidmhewitt/torrential'
license=('GPL')
-depends=('granite' 'libevent' 'libnatpmp' 'miniupnpc')
-makedepends=('cmake' 'git' 'vala')
-_commit=1d731f992e4567e102d1ffa28a0c44c4322eba76 # tags/1.1.0
-source=("git+https://github.com/davidmhewitt/torrential.git#commit=$_commit"
- 'transmission-torrential::git+https://github.com/davidmhewitt/transmission.git'
- 'git+https://github.com/transmission/dht.git'
- 'git+https://github.com/transmission/libb64.git'
- 'git+https://github.com/transmission/libevent.git'
- 'git+https://github.com/transmission/libnatpmp.git'
- 'git+https://github.com/transmission/libutp.git'
- 'git+https://github.com/transmission/miniupnpc.git'
- 'no-unity.patch'
- 'patch-vala.patch')
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '8b279ca266c8b1643cf10ff0a66a66283be6595959720bcc321fdef0f3da6ea7'
- 'f45f87330502796a3ab2d4798c8fa76f3ce63026828aa890e99ae06ed0adca1f')
+depends=('granite' 'libevent' 'libb64' 'miniupnpc' 'libnatpmp')
+makedepends=('meson' 'git' 'vala' 'libtransmission' 'dht' 'libutp')
+_commit=d17fc2728056af0e4abdf4d025a7f415900eeedb
+source=("git+https://github.com/davidmhewitt/torrential.git#commit=$_commit")
+sha256sums=('SKIP')
pkgver() {
cd $pkgname
@@ -36,39 +18,12 @@
git describe --tags | sed 's/-/+/g'
}
-prepare() {
- cd $pkgname
-
- # Remove Unity support
- patch -Np1 -i ../no-unity.patch
-
- # Fix build with vala 0.52
- patch -Np1 -i ../patch-vala.patch
-
- # Don't treat warnings as fatal
- sed -i '/--fatal-warnings/d' CMakeLists.txt
-
- git submodule init
- git submodule set-url transmission "$srcdir/transmission-torrential"
- git submodule update
-
- cd transmission
- git submodule init
- git submodule set-url third-party/dht "$srcdir/dht"
- git submodule set-url third-party/libb64 "$srcdir/libb64"
- git submodule set-url third-party/libevent "$srcdir/libevent"
- git submodule set-url third-party/libnatpmp "$srcdir/libnatpmp"
- git submodule set-url third-party/libutp "$srcdir/libutp"
- git submodule set-url third-party/miniupnpc "$srcdir/miniupnpc"
- git submodule update
-}
-
build() {
- cmake -S $pkgname -B build -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='/usr'
- cmake --build build
+ arch-meson $pkgname build
+ meson compile -C build
}
package() {
- DESTDIR="$pkgdir" cmake --install build
+ meson install -C build --destdir "$pkgdir"
ln -s com.github.davidmhewitt.torrential "$pkgdir/usr/bin/$pkgname"
}
Deleted: no-unity.patch
===================================================================
--- no-unity.patch 2022-02-10 22:48:52 UTC (rev 1131504)
+++ no-unity.patch 2022-02-10 23:00:02 UTC (rev 1131505)
@@ -1,77 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f4b631..dd5d925 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,12 +34,6 @@ add_subdirectory (po)
- # now let's actually check for the required dependencies
- pkg_check_modules(DEPS REQUIRED granite)
-
--pkg_check_modules (UNITY REQUIRED unity>=4.0.0)
--if (UNITY_FOUND)
-- add_definitions(${UNITY_CFLAGS})
-- link_directories(${UNITY_LIBRARY_DIRS})
--endif ()
--
- add_definitions(${DEPS_CFLAGS})
- link_directories(${DEPS_LIBRARY_DIRS})
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/transmission)
-@@ -71,7 +65,6 @@ CUSTOM_VAPIS
- # tell what libraries to use when compiling
- PACKAGES
- granite
-- unity
- posix
- OPTIONS
- --fatal-warnings
-@@ -87,7 +80,7 @@ add_schema (data/com.github.davidmhewitt.torrential.gschema.xml)
- # tell cmake what to call the executable we just made
- add_executable(${EXEC_NAME} ${VALA_C} ${GLIB_RESOURCES_ICONS})
- add_dependencies(${EXEC_NAME} transmission)
--target_link_libraries(${EXEC_NAME} ${DEPS_LIBRARIES} ${UNITY_LIBRARIES} transmission)
-+target_link_libraries(${EXEC_NAME} ${DEPS_LIBRARIES} transmission)
-
- # install the binaries we just made
- install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
-diff --git a/src/MainWindow.vala b/src/MainWindow.vala
-index 5b40124..5829902 100644
---- a/src/MainWindow.vala
-+++ b/src/MainWindow.vala
-@@ -35,7 +35,6 @@ public class Torrential.MainWindow : Gtk.Window {
- private Widgets.MultiInfoBar infobar;
- private Widgets.TorrentListBox list_box;
- private Gtk.ScrolledWindow list_box_scroll;
-- private Unity.LauncherEntry launcher_entry;
-
- private Gtk.SearchEntry search_entry;
-
-@@ -147,8 +146,6 @@ public class Torrential.MainWindow : Gtk.Window {
- set_titlebar (headerbar);
- show_all ();
-
-- launcher_entry = Unity.LauncherEntry.get_for_desktop_id ("com.github.davidmhewitt.torrential.desktop");
--
- var torrents = torrent_manager.get_torrents ();
- if (torrents.size > 0) {
- enable_main_view ();
-@@ -173,13 +170,6 @@ public class Torrential.MainWindow : Gtk.Window {
- refresh_timer = Timeout.add_seconds (1, () => {
- list_box.update ();
- update_category_totals (torrent_manager.get_torrents ());
-- launcher_entry.progress = torrent_manager.get_overall_progress ();
-- var focused = (get_window ().get_state () & Gdk.WindowState.FOCUSED) != 0;
-- if (!focused && list_box.has_visible_children ()) {
-- launcher_entry.progress_visible = true;
-- } else {
-- launcher_entry.progress_visible = false;
-- }
- return true;
- });
-
-@@ -395,7 +385,6 @@ public class Torrential.MainWindow : Gtk.Window {
- Source.remove (int_sig);
- Source.remove (term_sig);
-
-- launcher_entry.progress_visible = false;
- quitting_for_real = true;
- close ();
- }
Deleted: patch-vala.patch
===================================================================
--- patch-vala.patch 2022-02-10 22:48:52 UTC (rev 1131504)
+++ patch-vala.patch 2022-02-10 23:00:02 UTC (rev 1131505)
@@ -1,13 +0,0 @@
-diff --git a/src/Widgets/TorrentListRow.vala b/src/Widgets/TorrentListRow.vala
-index 11dd050..bf26c93 100644
---- a/src/Widgets/TorrentListRow.vala
-+++ b/src/Widgets/TorrentListRow.vala
-@@ -149,7 +149,7 @@ public class Torrential.Widgets.TorrentListRow : Gtk.ListBoxRow {
-
- private string generate_status_text () {
- if (torrent.downloading || torrent.seeding) {
-- char[40] buf = new char[40];
-+ char[] buf = new char[40];
- var down_speed = Transmission.String.Units.speed_KBps (buf, torrent.download_speed);
- var up_speed = Transmission.String.Units.speed_KBps (buf, torrent.upload_speed);
- return _("%i of %i peers connected. \u2b07%s \u2b06%s").printf (torrent.connected_peers, torrent.total_peers, down_speed, up_speed);
More information about the arch-commits
mailing list