[arch-commits] Commit in amule/repos (7 files)

Antonio Rojas arojas at archlinux.org
Tue Apr 30 19:38:16 UTC 2019


    Date: Tuesday, April 30, 2019 @ 19:38:14
  Author: arojas
Revision: 457059

archrelease: copy trunk to community-staging-x86_64

Added:
  amule/repos/community-staging-x86_64/
  amule/repos/community-staging-x86_64/PKGBUILD
    (from rev 457058, amule/trunk/PKGBUILD)
  amule/repos/community-staging-x86_64/amule-wxgtk-3.1.patch
    (from rev 457058, amule/trunk/amule-wxgtk-3.1.patch)
  amule/repos/community-staging-x86_64/amule.sysusers
    (from rev 457058, amule/trunk/amule.sysusers)
  amule/repos/community-staging-x86_64/amule.tmpfiles
    (from rev 457058, amule/trunk/amule.tmpfiles)
  amule/repos/community-staging-x86_64/amuled.systemd
    (from rev 457058, amule/trunk/amuled.systemd)
  amule/repos/community-staging-x86_64/amuleweb.systemd
    (from rev 457058, amule/trunk/amuleweb.systemd)

-----------------------+
 PKGBUILD              |   61 ++++++++++++++++++++++++++++++++++++++++++++++++
 amule-wxgtk-3.1.patch |   26 ++++++++++++++++++++
 amule.sysusers        |    1 
 amule.tmpfiles        |    1 
 amuled.systemd        |   12 +++++++++
 amuleweb.systemd      |   13 ++++++++++
 6 files changed, 114 insertions(+)

Copied: amule/repos/community-staging-x86_64/PKGBUILD (from rev 457058, amule/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1,61 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Henrik Ronellenfitsch <searinox at web.de>
+# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
+# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+# Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
+
+pkgname=amule
+pkgver=11004
+pkgrel=6
+pkgdesc="An eMule-like client for ed2k p2p network"
+arch=(x86_64)
+url="http://www.amule.org"
+license=(GPL)
+depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs)
+makedepends=(git ccache boost)
+source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver"
+        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles
+        amule-wxgtk-3.1.patch)
+sha256sums=('SKIP'
+            '20ac6b60c5f3bf49c0b080dfc02409da3c9d01b154344188008c6a75ca69681e'
+            'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+            'c4ca658ab4105b3b90e0bb3efcc8121eca1c4d873787db1ed4f637925c16d502'
+            'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d'
+            '2486059f4358e6c3cc1b42c8ca2494dca5e86321663ac13c3d2a8f4c1fe23fd2')
+
+prepare() {
+  cd amule
+  patch -p1 -i ../amule-wxgtk-3.1.patch # Fix build with wxgtk 3.1
+}
+
+build() {
+  cd amule
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
+              --enable-cas \
+              --enable-wxcas \
+              --enable-amule-daemon \
+              --enable-amulecmd \
+              --enable-amule-gui \
+              --enable-alc \
+              --enable-alcc \
+              --enable-webserver \
+              --disable-debug \
+              --enable-optimize \
+              --enable-ccache \
+              --enable-geoip \
+              --enable-upnp \
+              --enable-fileview \
+              --with-boost
+  make
+}
+
+package() {
+  cd amule
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir"/amuled.systemd "$pkgdir"/usr/lib/systemd/system/amuled.service
+  install -Dm644 "$srcdir"/amuleweb.systemd "$pkgdir"/usr/lib/systemd/system/amuleweb.service
+  install -Dm644 "$srcdir"/amule.sysusers "$pkgdir"/usr/lib/sysusers.d/amule.conf
+  install -Dm644 "$srcdir"/amule.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/amule.conf
+}

Copied: amule/repos/community-staging-x86_64/amule-wxgtk-3.1.patch (from rev 457058, amule/trunk/amule-wxgtk-3.1.patch)
===================================================================
--- community-staging-x86_64/amule-wxgtk-3.1.patch	                        (rev 0)
+++ community-staging-x86_64/amule-wxgtk-3.1.patch	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1,26 @@
+diff --git a/src/amuleDlg.cpp b/src/amuleDlg.cpp
+index 03bc83c3..a1dc07b2 100644
+--- a/src/amuleDlg.cpp
++++ b/src/amuleDlg.cpp
+@@ -1380,7 +1380,7 @@ void CamuleDlg::Create_Toolbar(bool orientation)
+ 	if (!m_wndToolbar) {
+ 		m_wndToolbar = CreateToolBar(
+ 			(orientation ? wxTB_VERTICAL : wxTB_HORIZONTAL) |
+-			wxNO_BORDER | wxTB_TEXT | wxTB_3DBUTTONS |
++			wxNO_BORDER | wxTB_TEXT | 
+ 			wxTB_FLAT | wxCLIP_CHILDREN | wxTB_NODIVIDER);
+ 
+ 
+diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp
+index 46070069..4483d0f1 100644
+--- a/src/extern/wxWidgets/listctrl.cpp
++++ b/src/extern/wxWidgets/listctrl.cpp
+@@ -4860,7 +4860,7 @@ void wxListMainWindow::SortItems( MuleListCtrlCompare fn, long data )
+ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
+ {
+     // FIXME
+-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
++#if ( defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
+     wxScrolledWindow::OnScroll(event);
+ #else
+     HandleOnScroll( event );

Copied: amule/repos/community-staging-x86_64/amule.sysusers (from rev 457058, amule/trunk/amule.sysusers)
===================================================================
--- community-staging-x86_64/amule.sysusers	                        (rev 0)
+++ community-staging-x86_64/amule.sysusers	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1 @@
+u amule - "aMule Client" /var/lib/amule

Copied: amule/repos/community-staging-x86_64/amule.tmpfiles (from rev 457058, amule/trunk/amule.tmpfiles)
===================================================================
--- community-staging-x86_64/amule.tmpfiles	                        (rev 0)
+++ community-staging-x86_64/amule.tmpfiles	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1 @@
+d /var/lib/amule 0750 amule amule

Copied: amule/repos/community-staging-x86_64/amuled.systemd (from rev 457058, amule/trunk/amuled.systemd)
===================================================================
--- community-staging-x86_64/amuled.systemd	                        (rev 0)
+++ community-staging-x86_64/amuled.systemd	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1,12 @@
+[Unit]
+Description=aMule Daemon
+After=network.target
+
+# This assumes that a user 'amule' exists, with a writeable home directory
+[Service]
+User=amule
+ExecStart=/usr/bin/amuled
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target

Copied: amule/repos/community-staging-x86_64/amuleweb.systemd (from rev 457058, amule/trunk/amuleweb.systemd)
===================================================================
--- community-staging-x86_64/amuleweb.systemd	                        (rev 0)
+++ community-staging-x86_64/amuleweb.systemd	2019-04-30 19:38:14 UTC (rev 457059)
@@ -0,0 +1,13 @@
+[Unit]
+Description=aMule Webserver
+Requires=amuled.service
+
+[Service]
+User=amule
+ExecStart=/usr/bin/amuleweb --quiet
+# If amuled still starting then amuleweb exits, restart until amuleweb is up 
+Restart=on-success
+RestartSec=3s
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list