[arch-commits] Commit in torrential/repos (4 files)
Morten Linderud
foxboron at archlinux.org
Thu Apr 1 15:19:27 UTC 2021
Date: Thursday, April 1, 2021 @ 15:19:27
Author: foxboron
Revision: 910852
archrelease: copy trunk to community-staging-x86_64
Added:
torrential/repos/community-staging-x86_64/
torrential/repos/community-staging-x86_64/PKGBUILD
(from rev 910851, torrential/trunk/PKGBUILD)
torrential/repos/community-staging-x86_64/no-unity.patch
(from rev 910851, torrential/trunk/no-unity.patch)
torrential/repos/community-staging-x86_64/patch-vala.patch
(from rev 910851, torrential/trunk/patch-vala.patch)
------------------+
PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++++++++++++++
no-unity.patch | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
patch-vala.patch | 13 ++++++++
3 files changed, 162 insertions(+)
Copied: torrential/repos/community-staging-x86_64/PKGBUILD (from rev 910851, torrential/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-04-01 15:19:27 UTC (rev 910852)
@@ -0,0 +1,72 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=torrential
+pkgver=1.1.0
+pkgrel=4
+pkgdesc="Simple BitTorrent client for elementary OS"
+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#commit=$_commit"
+ "transmission-torrential::git+https://github.com/davidmhewitt/transmission"
+ "git+https://github.com/transmission/dht"
+ "git+https://github.com/transmission/libb64"
+ "git+https://github.com/transmission/libevent"
+ "git+https://github.com/transmission/libnatpmp"
+ "git+https://github.com/transmission/libutp"
+ "git+https://github.com/transmission/miniupnpc"
+ "no-unity.patch"
+ "patch-vala.patch")
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '8b279ca266c8b1643cf10ff0a66a66283be6595959720bcc321fdef0f3da6ea7'
+ 'f45f87330502796a3ab2d4798c8fa76f3ce63026828aa890e99ae06ed0adca1f')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ [[ -d build ]] || mkdir build
+ cd $pkgname
+ 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
+
+ cd ..
+ patch -Np1 -i ../no-unity.patch
+ patch -Np1 -i ../patch-vala.patch
+ sed -i '/--fatal-warnings/d' CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake -G "Unix Makefiles" ../$pkgname/ \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: torrential/repos/community-staging-x86_64/no-unity.patch (from rev 910851, torrential/trunk/no-unity.patch)
===================================================================
--- community-staging-x86_64/no-unity.patch (rev 0)
+++ community-staging-x86_64/no-unity.patch 2021-04-01 15:19:27 UTC (rev 910852)
@@ -0,0 +1,77 @@
+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 ();
+ }
Copied: torrential/repos/community-staging-x86_64/patch-vala.patch (from rev 910851, torrential/trunk/patch-vala.patch)
===================================================================
--- community-staging-x86_64/patch-vala.patch (rev 0)
+++ community-staging-x86_64/patch-vala.patch 2021-04-01 15:19:27 UTC (rev 910852)
@@ -0,0 +1,13 @@
+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