revert changes because mksource is only necessary for source codes that contains nonfree files

4 files changed, 40 insertions, 65 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 54d408f98..ad6233f39 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,11 +14,9 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_parabolaname=iceweasel-libre
 _debver=26.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
-_parabolarepo=https://repo.parabolagnulinux.org/sources/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
@@ -50,59 +48,30 @@ install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
 provides=('firefox')
-source=("$_parabolarepo/`debfile $_parabolaname`_$_debver.orig.tar.bz2"
+source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
         mozconfig
         mozconfig.pgo
+        libre.patch
+        gnu_headshadow.png
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
         Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('63e150a935d27bdfe4a1fec2e8336c0b'
+md5sums=('219cf21e0642e8a364365286f23d0624'
          '2001d0477bcefd0eeaab584402133691'
          '023120a970670dc85cea19393f0b94b6'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
+         'fea121a94737ec8641b39e7120a048d3'
+         'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '6620e724ec9a1be74e65089d81d802f7'
          '816013881cfc9a1f4f0ede72b014f8b3'
          '6e335a517c68488941340ee1c23f97b0'
          'dbf1c021e5f7ac323197b219bf213c50'
          '8e165ef85ddd72491f0b48f8954afca6')
-mksource=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-          libre.patch
-          gnu_headshadow.png)
-mkmd5sums=('219cf21e0642e8a364365286f23d0624'
-           'fea121a94737ec8641b39e7120a048d3'
-           'b03a979a78484503ba8dddad4f2c96d1')
-
-mksource() {
-  export DEBIAN_BUILD="mozilla-release"
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
-  sed -i 's|Adobe Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|URL of the GeoLocation backend|d;
-          \|geo[.]wifi[.]uri|d;
-         ' browser/app/profile/firefox.js \
-           browser/metro/profile/metro.js
-  rm -v browser/base/content/abouthome/snippet*.png || true
-  sed -i "\|abouthome/snippet|d" browser/base/jar.mn
-
-  # Replace common URLs
-  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-         ' browser/app/profile/firefox.js
-
-  install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
-}
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -125,10 +94,32 @@ prepare() {
 
   quilt push -av
 
+  install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
+
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/Fixup-Reset-Firefox-after-bad-merge.patch"
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
 
+  # Patch and remove anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
+  sed -i 's|Adobe Flash|SWF Player|g;
+         ' browser/base/content/pageinfo/permissions.js \
+           browser/base/content/browser-plugins.js
+  sed -i '\|URL of the GeoLocation backend|d;
+          \|geo[.]wifi[.]uri|d;
+         ' browser/app/profile/firefox.js \
+           browser/metro/profile/metro.js
+  rm -v browser/base/content/abouthome/snippet*.png || true
+  sed -i "\|abouthome/snippet|d" browser/base/jar.mn
+
+  # Replace common URLs
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+         ' browser/app/profile/firefox.js
+
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
 
   if $_pgo; then
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD
index 0871de5d4..42d597740 100644
--- a/libre/midori-libre/PKGBUILD
+++ b/libre/midori-libre/PKGBUILD
@@ -26,12 +26,10 @@ optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
             'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
             'aria2: download utility')
 options=('!emptydirs')
-mksource=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
-source=("https://repo.parabolagnulinux.org/sources/${pkgname}_${pkgver}_all_.tar.bz2")
-mksha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
-sha256sums=('463200bb67c35fc4fa7447689174676aba02aa6ec1cec476ca0e83b0d50f65d6')
+source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
+sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
 
-mksource() {
+prepare() {
   cd "$_pkgname-$pkgver"
 
   # remove non-privacy search providers
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index 6f7efe816..15446d91b 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -12,20 +12,18 @@ url="http://www.qupzilla.com/"
 license=('GPL3')
 makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
 optdepends=('bash-completion: bash completion support')
-source=("http://repo.parabolagnulinux.org/sources/$pkgbase-$pkgver.tar.gz")
-md5sums=('57f51852d14c66a030bb75febcf1eabb')
-mksource=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
+source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
 noextract=("$_pkgbase-$pkgver.tar.gz")
 install="$_pkgbase.install"
-mkmd5sums=('2988c3afbef2612fd4acdb78ebb1fc35'
-           '1d926e97a5b287d40fb695f6516f2a06'
-           '0f166fa102af975b3b8ac030d477e9b8'
-           '77120a0c39ba8254e5b2c273910f029a')
+md5sums=('2988c3afbef2612fd4acdb78ebb1fc35'
+         '1d926e97a5b287d40fb695f6516f2a06'
+         '0f166fa102af975b3b8ac030d477e9b8'
+         '77120a0c39ba8254e5b2c273910f029a')
 
-mksource() {
+prepare() {
   # extract
   mkdir -p qt{4,5}
   bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 5726ae835..dda93c171 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -10,34 +10,22 @@ url="http://xyne.archlinux.ca/projects/reflector"
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
-  https://repo.parabolagnulinux.org/sources/reflector-2014.tar.xz
-  https://repo.parabolagnulinux.org/sources/reflector-2014.tar.xz.sig
-)
-sha512sums=(
-  2783c578c4a29b1e7db1320a7f2e259e104dacab2bcc9cfddcea91335cbb89b282e1d3f03919f9760a3c431ba0d358b4f54fd5bab72488cf74e0e2cd73fc6ba2
-  SKIP
-)
-md5sums=(
-  9b6ec85b8be7f9c4f8b68d00274b0cde
-  SKIP
-)
-mksource=(
   http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz
   http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz.sig
   rebranding.patch
 )
-mksha512sums=(
+sha512sums=(
   ac9e0026019048c96be5dd4d156bf79b7d7616f764b5d8fb169cb09cbf629a3e2b1efb1ee7cb53b4e0cd109b985f598d9f80941714e47ed0f21c6417df9b073b
   SKIP
   83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
 )
-mkmd5sums=(
+md5sums=(
   69ab92b948ffe842189229d09bfbf1c0
   SKIP
   24c2a21bc1ac0d3758d8043f36d95add
 )
 
-mksource ()
+prepare ()
 {
   cd "$srcdir/$pkgname-$pkgver"
   # Rebranding for Parabola