upkg, disabled pgo for now (gcc8?)

3 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc884fd2cf5c..5f39102c79b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat May 19 15:19:07 UTC 2018
+# Sat Jun  9 05:52:18 UTC 2018
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 60.0.1
-	pkgrel = 2
+	pkgver = 60.0.2
+	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	arch = i686
 	arch = x86_64
@@ -45,20 +45,21 @@ pkgbase = firefox-kde-opensuse
 	depends = gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = firefox=60.0.1
+	provides = firefox=60.0.2
 	conflicts = firefox
 	options = !emptydirs
+	options = debug
 	options = strip
-	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_60_0_1_RELEASE
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_60_0_2_RELEASE
 	source = mozconfig
 	source = firefox.desktop
 	source = vendor.js
 	source = kde.js
 	source = firefox-fixed-loading-icon.png
-	source = firefox-branded-icons-847ae61baab6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/847ae61baab6/firefox-branded-icons.patch
-	source = firefox-kde-847ae61baab6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/847ae61baab6/firefox-kde.patch
-	source = mozilla-kde-847ae61baab6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/847ae61baab6/mozilla-kde.patch
-	source = mozilla-nongnome-proxies-847ae61baab6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/847ae61baab6/mozilla-nongnome-proxies.patch
+	source = firefox-branded-icons-bf0d08380dcf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/bf0d08380dcf/firefox-branded-icons.patch
+	source = firefox-kde-bf0d08380dcf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/bf0d08380dcf/firefox-kde.patch
+	source = mozilla-kde-bf0d08380dcf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/bf0d08380dcf/mozilla-kde.patch
+	source = mozilla-nongnome-proxies-bf0d08380dcf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/bf0d08380dcf/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
@@ -68,14 +69,14 @@ pkgbase = firefox-kde-opensuse
 	source = 0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
 	source = https://dev.gentoo.org/~axs/mozilla/patchsets/source/firefox-60.0-patches-01.tar.xz
 	md5sums = SKIP
-	md5sums = 0a9a1df3daa55652c9e88465aa3bb7a4
+	md5sums = 8831241577913001175641c092c9d3ea
 	md5sums = 14e0f6237a79b85e60256f4808163160
 	md5sums = c9385708f41599649e4e14fd3af506ce
 	md5sums = 05bb69d25fb3572c618e3adf1ee7b670
 	md5sums = 6e335a517c68488941340ee1c23f97b0
 	md5sums = df9f710c842d4847aae5bc667f97f4a2
 	md5sums = dbf69e423c18e08536d9999f0d405a7a
-	md5sums = d1f33934ce9574df158e252a9ae873b3
+	md5sums = 3640c50476625fc9e292074ebaf4fff9
 	md5sums = 0661e259fe57df87fca791f4aeb78da0
 	md5sums = d0bb97636b07d521f279c01233f0cbdb
 	md5sums = fe24f5ea463013bb7f1c12d12dce41b2
diff --git a/PKGBUILD b/PKGBUILD
index 84ee67fff7eb..11bfd0279bea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _gtk3_wayland=false
 
 # try to build with PGO
 # currently broken
-_pgo=true
+#_pgo=true
 
 # globalmenu
 # to support globalmenu a patch from ubuntu is applied
@@ -20,8 +20,8 @@ _pgo=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=60.0.1
-pkgrel=2
+pkgver=60.0.2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -39,8 +39,8 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech')
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
-_patchrev=847ae61baab6
-options=('!emptydirs'  'strip')
+_patchrev=bf0d08380dcf
+options=('!emptydirs'  'debug' 'strip')
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
@@ -235,14 +235,14 @@ END
   ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
 }
 md5sums=('SKIP'
-         '0a9a1df3daa55652c9e88465aa3bb7a4'
+         '8831241577913001175641c092c9d3ea'
          '14e0f6237a79b85e60256f4808163160'
          'c9385708f41599649e4e14fd3af506ce'
          '05bb69d25fb3572c618e3adf1ee7b670'
          '6e335a517c68488941340ee1c23f97b0'
          'df9f710c842d4847aae5bc667f97f4a2'
          'dbf69e423c18e08536d9999f0d405a7a'
-         'd1f33934ce9574df158e252a9ae873b3'
+         '3640c50476625fc9e292074ebaf4fff9'
          '0661e259fe57df87fca791f4aeb78da0'
          'd0bb97636b07d521f279c01233f0cbdb'
          'fe24f5ea463013bb7f1c12d12dce41b2'
diff --git a/mozconfig b/mozconfig
index 6f97a0b17ece..30e92cb39cbf 100644
--- a/mozconfig
+++ b/mozconfig
@@ -46,7 +46,7 @@ ac_add_options --disable-updater
 ac_add_options --disable-gconf
 ac_add_options --disable-tests
 
-STRIP_FLAGS="--strip-debug"
+#STRIP_FLAGS="--strip-debug"
  
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'