Date: Sunday, September 1, 2019 @ 13:25:17 Author: arojas Revision: 506143
archrelease: copy trunk to community-x86_64 Added: amule/repos/community-x86_64/PKGBUILD (from rev 506142, amule/trunk/PKGBUILD) amule/repos/community-x86_64/amule.sysusers (from rev 506142, amule/trunk/amule.sysusers) amule/repos/community-x86_64/amule.tmpfiles (from rev 506142, amule/trunk/amule.tmpfiles) amule/repos/community-x86_64/amuled.systemd (from rev 506142, amule/trunk/amuled.systemd) amule/repos/community-x86_64/amuleweb.systemd (from rev 506142, amule/trunk/amuleweb.systemd) Deleted: amule/repos/community-x86_64/PKGBUILD amule/repos/community-x86_64/amule-wxgtk-3.1.patch amule/repos/community-x86_64/amule.sysusers amule/repos/community-x86_64/amule.tmpfiles amule/repos/community-x86_64/amuled.systemd amule/repos/community-x86_64/amuleweb.systemd -----------------------+ PKGBUILD | 115 ++++++++++++++++++++++-------------------------- amule-wxgtk-3.1.patch | 26 ---------- amule.sysusers | 2 amule.tmpfiles | 2 amuled.systemd | 24 +++++----- amuleweb.systemd | 26 +++++----- 6 files changed, 81 insertions(+), 114 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-01 13:24:55 UTC (rev 506142) +++ PKGBUILD 2019-09-01 13:25:17 UTC (rev 506143) @@ -1,61 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Henrik Ronellenfitsch <seari...@web.de> -# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> -# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> -# Contributor: Anatol Pomozov <anatol.pomo...@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-x86_64/PKGBUILD (from rev 506142, amule/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-01 13:25:17 UTC (rev 506143) @@ -0,0 +1,54 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Henrik Ronellenfitsch <seari...@web.de> +# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> +# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> +# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=amule +pkgver=11025 +pkgrel=1 +pkgdesc="An eMule-like client for ed2k p2p network" +arch=(x86_64) +url="http://www.amule.org" +license=(GPL) +depends=(wxgtk 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) +sha256sums=('SKIP' + '20ac6b60c5f3bf49c0b080dfc02409da3c9d01b154344188008c6a75ca69681e' + 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2' + 'c4ca658ab4105b3b90e0bb3efcc8121eca1c4d873787db1ed4f637925c16d502' + 'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d') + +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 +} Deleted: amule-wxgtk-3.1.patch =================================================================== --- amule-wxgtk-3.1.patch 2019-09-01 13:24:55 UTC (rev 506142) +++ amule-wxgtk-3.1.patch 2019-09-01 13:25:17 UTC (rev 506143) @@ -1,26 +0,0 @@ -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 ); Deleted: amule.sysusers =================================================================== --- amule.sysusers 2019-09-01 13:24:55 UTC (rev 506142) +++ amule.sysusers 2019-09-01 13:25:17 UTC (rev 506143) @@ -1 +0,0 @@ -u amule - "aMule Client" /var/lib/amule Copied: amule/repos/community-x86_64/amule.sysusers (from rev 506142, amule/trunk/amule.sysusers) =================================================================== --- amule.sysusers (rev 0) +++ amule.sysusers 2019-09-01 13:25:17 UTC (rev 506143) @@ -0,0 +1 @@ +u amule - "aMule Client" /var/lib/amule Deleted: amule.tmpfiles =================================================================== --- amule.tmpfiles 2019-09-01 13:24:55 UTC (rev 506142) +++ amule.tmpfiles 2019-09-01 13:25:17 UTC (rev 506143) @@ -1 +0,0 @@ -d /var/lib/amule 0750 amule amule Copied: amule/repos/community-x86_64/amule.tmpfiles (from rev 506142, amule/trunk/amule.tmpfiles) =================================================================== --- amule.tmpfiles (rev 0) +++ amule.tmpfiles 2019-09-01 13:25:17 UTC (rev 506143) @@ -0,0 +1 @@ +d /var/lib/amule 0750 amule amule Deleted: amuled.systemd =================================================================== --- amuled.systemd 2019-09-01 13:24:55 UTC (rev 506142) +++ amuled.systemd 2019-09-01 13:25:17 UTC (rev 506143) @@ -1,12 +0,0 @@ -[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-x86_64/amuled.systemd (from rev 506142, amule/trunk/amuled.systemd) =================================================================== --- amuled.systemd (rev 0) +++ amuled.systemd 2019-09-01 13:25:17 UTC (rev 506143) @@ -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 Deleted: amuleweb.systemd =================================================================== --- amuleweb.systemd 2019-09-01 13:24:55 UTC (rev 506142) +++ amuleweb.systemd 2019-09-01 13:25:17 UTC (rev 506143) @@ -1,13 +0,0 @@ -[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 Copied: amule/repos/community-x86_64/amuleweb.systemd (from rev 506142, amule/trunk/amuleweb.systemd) =================================================================== --- amuleweb.systemd (rev 0) +++ amuleweb.systemd 2019-09-01 13:25:17 UTC (rev 506143) @@ -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