octopi-0.7.0-5.parabola1: move service file from /etc to /usr/lib

2 files changed, 64 insertions, 43 deletions

diff --git a/libre/octopi/PKGBUILD b/libre/octopi/PKGBUILD
index e6fec0c79..fed354f0c 100644
--- a/libre/octopi/PKGBUILD
+++ b/libre/octopi/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=octopi
 pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
 pkgver=0.7.0
-pkgrel=4.parabola1
+pkgrel=5.parabola1
 arch=('i686' 'x86_64')
 url="https://github.com/aarnt/octopi"
 license=('GPL2')
@@ -16,7 +16,7 @@ source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
 sha256sums=('03d15458ebe482e5a9a00e7a3db5676a53886c754b13a7c56e36d75b73f2d496'
             '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
             '459f924eba5bc780cb3a0cb955e9d7c634fe77d7e9f7b1a44d86c827535acbe3'
-            '48bd938f2286e9eca5ae8b204fea5c628a53906c4b8aa9ca304a3e25dcc99822')
+            '08cb93ec3d4bc3d045d7b680d76bef345939c88d5804f8ac37002c2b931420a8')
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
@@ -56,7 +56,7 @@ build() {
 }
 
 package_octopi() {
-  pkgdesc="A powerful Pacman frontend using Qt5 libs, with Parabola support"
+  pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur and yaourt recommendation and with Parabola support"
   install="octopi.install"
   depends=('qt5-base' 'qt5-declarative' 'xterm')
   optdepends=('kdesu: for KDE'
@@ -83,7 +83,7 @@ package_octopi() {
 
 	#speedup files
 	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/speedup/${pkgname}.service" "${pkgdir}/etc/systemd/system/${pkgname}.service"
+	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/speedup/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
   install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy"
   install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf"
diff --git a/libre/octopi/parabola-support.patch b/libre/octopi/parabola-support.patch
index 1e0d88291..77b62be8f 100644
--- a/libre/octopi/parabola-support.patch
+++ b/libre/octopi/parabola-support.patch
@@ -1,7 +1,21 @@
-diff -Nur octopi-0.7.0.orig/src/mainwindow_news.cpp octopi-0.7.0/src/mainwindow_news.cpp
---- octopi-0.7.0.orig/src/mainwindow_news.cpp	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/mainwindow_news.cpp	2015-07-09 10:53:40.713803510 -0300
-@@ -92,6 +92,11 @@
+From 0e215b619b32e58089cae01ecf4db5fa79f33664 Mon Sep 17 00:00:00 2001
+From: Alexandre Arnt <falso@correio.com>
+Date: Sat, 11 Jul 2015 18:13:51 -0300
+Subject: [PATCH] - Added Parabola GNU/Linux-libre support (thanks to coadde).
+
+---
+ src/mainwindow_news.cpp |  5 +++++
+ src/package.cpp         |  3 ++-
+ src/strconstants.h      | 15 ++++++++++++++-
+ src/unixcommand.cpp     |  4 ++++
+ src/unixcommand.h       |  2 +-
+ src/utils.cpp           | 13 ++++++++++++-
+
+diff --git a/src/mainwindow_news.cpp b/src/mainwindow_news.cpp
+index da54e30..e5be94b 100644
+--- a/src/mainwindow_news.cpp
++++ b/src/mainwindow_news.cpp
+@@ -83,6 +83,11 @@ void MainWindow::refreshDistroNews(bool searchForLatestNews, bool gotoNewsTab)
        writeToTabOutputExt("<b>" +
                            StrConstants::getSearchingForDistroNews().arg("Netrunner Rolling") + "</b>");
      }
@@ -13,10 +27,11 @@ diff -Nur octopi-0.7.0.orig/src/mainwindow_news.cpp octopi-0.7.0/src/mainwindow_
  
      /*
       * Here, we retrieve distro's latest news without
-diff -Nur octopi-0.7.0.orig/src/package.cpp octopi-0.7.0/src/package.cpp
---- octopi-0.7.0.orig/src/package.cpp	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/package.cpp	2015-07-09 10:53:40.713803510 -0300
-@@ -1154,7 +1154,8 @@
+diff --git a/src/package.cpp b/src/package.cpp
+index 9815e10..c5014db 100644
+--- a/src/package.cpp
++++ b/src/package.cpp
+@@ -1178,7 +1178,8 @@ QStringList Package::getContents(const QString& pkgName, bool isInstalled)
    else if (UnixCommand::getLinuxDistro() == ectn_ARCHBANGLINUX ||
             UnixCommand::getLinuxDistro() == ectn_ARCHLINUX ||
             UnixCommand::getLinuxDistro() == ectn_KAOS ||
@@ -26,10 +41,11 @@ diff -Nur octopi-0.7.0.orig/src/package.cpp octopi-0.7.0/src/package.cpp
    {
      result = UnixCommand::getPackageContentsUsingPkgfile(pkgName);
    }
-diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
---- octopi-0.7.0.orig/src/strconstants.h	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/strconstants.h	2015-07-09 11:10:32.856845110 -0300
-@@ -60,6 +60,9 @@
+diff --git a/src/strconstants.h b/src/strconstants.h
+index 20de4b3..3f6f1ab 100644
+--- a/src/strconstants.h
++++ b/src/strconstants.h
+@@ -60,6 +60,9 @@ class StrConstants{
      if (UnixCommand::getLinuxDistro() == ectn_KAOS)
        return QLatin1String( "KCP" );
  
@@ -39,7 +55,7 @@ diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
      return QLatin1String( "AUR" );
    }
  
-@@ -68,6 +71,8 @@
+@@ -68,6 +71,8 @@ class StrConstants{
        return QLatin1String( "ccr" );
      else if (UnixCommand::getLinuxDistro() == ectn_KAOS)
        return QLatin1String( "kcp" );
@@ -48,16 +64,7 @@ diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
  
      return QLatin1String( "aur" );
    }
-@@ -85,6 +90,8 @@
-         ret = QLatin1String( "kcp" );
-       else if (UnixCommand::hasTheExecutable("pacaur"))
-         ret = QLatin1String( "pacaur" );
-+      else if (UnixCommand::getLinuxDistro() == ectn_PARABOLA)
-+        ret = QLatin1String( "custom" );
-       else
-         ret = QLatin1String( "yaourt" );
- 
-@@ -100,6 +107,8 @@
+@@ -100,6 +105,8 @@ class StrConstants{
        return QLatin1String( "Ccr" );
      else if (UnixCommand::getLinuxDistro() == ectn_KAOS)
        return QLatin1String( "KCP" );
@@ -66,7 +73,7 @@ diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
  
      return QLatin1String( "AUR" );
    }
-@@ -110,6 +119,8 @@
+@@ -110,6 +117,8 @@ class StrConstants{
        return QLatin1String( "ccr/" );
      else if (UnixCommand::getLinuxDistro() == ectn_KAOS)
        return "kcp/";
@@ -75,7 +82,7 @@ diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
  
      return QLatin1String( "aur/" );
    }
-@@ -142,12 +153,16 @@
+@@ -142,12 +151,16 @@ class StrConstants{
      return QObject::tr("Netrunner Rolling news");
    }
  
@@ -93,10 +100,11 @@ diff -Nur octopi-0.7.0.orig/src/strconstants.h octopi-0.7.0/src/strconstants.h
    }
  
    static QString getInternetUnavailableError(){
-diff -Nur octopi-0.7.0.orig/src/unixcommand.cpp octopi-0.7.0/src/unixcommand.cpp
---- octopi-0.7.0.orig/src/unixcommand.cpp	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/unixcommand.cpp	2015-07-09 10:53:40.717136678 -0300
-@@ -1036,6 +1036,10 @@
+diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
+index 5c2d9e9..43e0fbf 100644
+--- a/src/unixcommand.cpp
++++ b/src/unixcommand.cpp
+@@ -1036,6 +1036,10 @@ LinuxDistro UnixCommand::getLinuxDistro()
        {
          ret = ectn_NETRUNNER;
        }
@@ -107,10 +115,11 @@ diff -Nur octopi-0.7.0.orig/src/unixcommand.cpp octopi-0.7.0/src/unixcommand.cpp
        else
        {
          ret = ectn_UNKNOWN;
-diff -Nur octopi-0.7.0.orig/src/unixcommand.h octopi-0.7.0/src/unixcommand.h
---- octopi-0.7.0.orig/src/unixcommand.h	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/unixcommand.h	2015-07-09 10:53:40.717136678 -0300
-@@ -37,7 +37,7 @@
+diff --git a/src/unixcommand.h b/src/unixcommand.h
+index 3a33754..1fda5be 100644
+--- a/src/unixcommand.h
++++ b/src/unixcommand.h
+@@ -37,7 +37,7 @@ enum CommandExecuting { ectn_NONE, ectn_MIRROR_CHECK, ectn_SYNC_DATABASE,
                          ectn_RUN_IN_TERMINAL };
  
  enum LinuxDistro { ectn_ANTERGOS, ectn_ARCHBANGLINUX, ectn_ARCHBSD, ectn_ARCHLINUX, ectn_CHAKRA,
@@ -119,10 +128,11 @@ diff -Nur octopi-0.7.0.orig/src/unixcommand.h octopi-0.7.0/src/unixcommand.h
  
  enum Language { ectn_LANG_ENGLISH, ectn_LANG_USER_DEFINED };
  
-diff -Nur octopi-0.7.0.orig/src/utils.cpp octopi-0.7.0/src/utils.cpp
---- octopi-0.7.0.orig/src/utils.cpp	2015-04-27 20:05:43.000000000 -0300
-+++ octopi-0.7.0/src/utils.cpp	2015-07-09 11:21:49.993222650 -0300
-@@ -278,6 +278,7 @@
+diff --git a/src/utils.cpp b/src/utils.cpp
+index 30ca38e..2c82811 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -278,6 +278,7 @@ QString utils::retrieveDistroNews(bool searchForLatestNews)
    //const QString ctn_MANJARO_LINUX_RSS_URL = "http://manjaro.org/feed/";
    const QString ctn_MANJARO_LINUX_RSS_URL = "https://manjaro.github.io/feed.xml";
    const QString ctn_NETRUNNER_RSS_URL = "http://www.netrunner-os.com/feed/";
@@ -130,18 +140,29 @@ diff -Nur octopi-0.7.0.orig/src/utils.cpp octopi-0.7.0/src/utils.cpp
  
    LinuxDistro distro = UnixCommand::getLinuxDistro();
    QString res;
-@@ -326,6 +327,10 @@
+@@ -295,7 +296,7 @@ QString utils::retrieveDistroNews(bool searchForLatestNews)
+   }
+ 
+   if(searchForLatestNews && UnixCommand::hasInternetConnection() && distro != ectn_UNKNOWN)
+-  {
++  {    
+     QString curlCommand = "curl %1 -o %2";
+ 
+     if (distro == ectn_ANTERGOS)
+@@ -326,6 +327,12 @@ QString utils::retrieveDistroNews(bool searchForLatestNews)
      {
        curlCommand = curlCommand.arg(ctn_NETRUNNER_RSS_URL).arg(tmpRssPath);
      }
 +    else if (distro == ectn_PARABOLA)
 +    {
++      //Parabola has a certificate which is not "trusted" by default, so we use "curl -k"
++      curlCommand = "curl -k %1 -o %2";
 +      curlCommand = curlCommand.arg(ctn_PARABOLA_RSS_URL).arg(tmpRssPath);
 +    }
  
      if (UnixCommand::runCurlCommand(curlCommand).isEmpty())
      {
-@@ -438,6 +443,10 @@
+@@ -438,6 +445,10 @@ QString utils::parseDistroNews()
    {
      html = "<p align=\"center\"><h2>" + StrConstants::getNetrunnerNews() + "</h2></p><ul>";
    }