upgpkg: postman 6.1.2-1

3 files changed, 29 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 043e6267f199..3da4e091dbd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = postman
 	pkgdesc = Build, test, and document your APIs faster
-	pkgver = 6.0.10
+	pkgver = 6.1.2
 	pkgrel = 1
 	url = https://www.getpostman.com
 	arch = x86_64
 	license = custom
 	depends = electron
-	depends = ttf-opensans
 	conflicts = postman-bin
-	source = postman-6.0.10.zip::https://dl.pstmn.io/download/version/6.0.10/linux64
+	source = postman-6.1.2.zip::https://dl.pstmn.io/download/version/6.1.2/linux64
 	source = remove-updater.patch
-	sha256sums = 82e6debb7bcb436679243581add5cc85cc7c96846c19c76d07a5416e16845a48
-	sha256sums = dde734f0fe3006c8a1976ca55c3bcef679e0f27d6d1456a53804c8e30c2a1b9d
+	sha256sums = 5e8a8df2893031eb98190690a0d3a98f6330b01f302a6975e62464dc66cbc6b7
+	sha256sums = e6067c9a83c4bf13ac739debb23b67ae8b6d62beb47f65fc2748bf9a924aec02
 
 pkgname = postman
 
diff --git a/PKGBUILD b/PKGBUILD
index 658bda25d91b..e53ffa1e0923 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,36 @@
-# Maintainer: kitsunyan <kitsunyan@inbox.ru>
+# Maintainer: kitsunyan <`echo a2l0c3VueWFuQGFpcm1haWwuY2MK | base64 -d`>
 
 pkgname=postman
-pkgver=6.0.10
+pkgver=6.1.2
 pkgrel=1
 pkgdesc='Build, test, and document your APIs faster'
 arch=('x86_64')
 url='https://www.getpostman.com'
 license=('custom')
-depends=(electron ttf-opensans)
+depends=(electron)
 conflicts=(postman-bin)
 source=("postman-$pkgver.zip::https://dl.pstmn.io/download/version/${pkgver}/linux64"
         'remove-updater.patch')
-sha256sums=('82e6debb7bcb436679243581add5cc85cc7c96846c19c76d07a5416e16845a48'
-            'dde734f0fe3006c8a1976ca55c3bcef679e0f27d6d1456a53804c8e30c2a1b9d')
+sha256sums=('5e8a8df2893031eb98190690a0d3a98f6330b01f302a6975e62464dc66cbc6b7'
+            'e6067c9a83c4bf13ac739debb23b67ae8b6d62beb47f65fc2748bf9a924aec02')
 
 prepare() {
-  cd "$srcdir/Postman/resources/app"
+  cd "$srcdir/Postman/app/resources/app"
 
-  # remove updater from menu
-  patch -Np1 -i "$srcdir/remove-updater.patch"
-
-  for f in 'js/console.js' 'js/requester.js' 'js/runner.js' 'js/shared.js'; do
-    # set "DISABLE_ANALYTICS" and "DISABLE_UPDATES" variables to "true"
-    sed -i "$f" \
-    -e 's/window.DISABLE_ANALYTICS = false;/window.DISABLE_ANALYTICS = true;/' \
-    -e 's/window.DISABLE_UPDATES = false;/window.DISABLE_UPDATES = true;/'
-  done
+  # remove updater from settings and menu, disable updates and analytics
+  patch -Np1 -r - --no-backup-if-mismatch -i "$srcdir/remove-updater.patch"
 }
 
 package() {
-  cd "$srcdir/Postman"
+  cd "$srcdir/Postman/app"
 
   mkdir -p "$pkgdir/usr/lib/"
   cp -rp 'resources/app' "$pkgdir/usr/lib/postman"
 
-  # remove backup files
-  find "$pkgdir/usr/lib/postman" -name '*.orig' -print0 | xargs -0 rm -f
-
   # install licenses
   find . -maxdepth 1 -iname 'license*' -print0 |
   xargs -n 1 -0 -I {} install -Dm644 {} "$pkgdir/usr/share/licenses/$pkgname/{}"
 
-  # create font links
-  ln -sf '/usr/share/fonts/TTF/OpenSans-Bold.ttf' \
-  "$pkgdir/usr/lib/postman/assets/fonts/OpenSans/OpenSans-Bold.ttf"
-  ln -sf '/usr/share/fonts/TTF/OpenSans-Regular.ttf' \
-  "$pkgdir/usr/lib/postman/assets/fonts/OpenSans/OpenSans-Regular.ttf"
-  ln -sf '/usr/share/fonts/TTF/OpenSans-SemiBold.ttf' \
-  "$pkgdir/usr/lib/postman/assets/fonts/OpenSans/OpenSans-Semibold.ttf"
-
   # create run script
   mkdir -p "$pkgdir/usr/bin"
   printf '%s\n' \
diff --git a/remove-updater.patch b/remove-updater.patch
index ce96e22082f4..b98e1b492f5a 100644
--- a/remove-updater.patch
+++ b/remove-updater.patch
@@ -1,42 +1,29 @@
 --- a/services/menuManager.js
 +++ b/services/menuManager.js
-@@ -13,11 +13,6 @@
-         label: appName,
-         submenu: [
-           { role: 'about' },
+@@ -19,5 +19,0 @@
 -          {
 -            label: 'Check for Updates...',
 -            click: function (menuItem, browserWindow, options) { menuManager.handleMenuAction('checkElectronUpdates', null, options); }
 -          },
 -          { type: 'separator' },
-           {
-             label: 'Preferences',
-             accelerator: 'CmdOrCtrl+,',
-@@ -346,11 +341,6 @@
-         label: 'Help',
-         role: 'help',
-         submenu: [
+@@ -352,5 +347,0 @@
 -          {
 -            label: 'Check for Updates',
 -            click: function (menuItem, browserWindow, options) { menuManager.handleMenuAction('checkElectronUpdates', null, options); }
 -          },
 -          { type: 'separator' },
-           {
-             label: 'Documentation',
-             click: function (menuItem, browserWindow, options) { menuManager.handleMenuAction('openCustomUrl', 'https://www.getpostman.com/docs/', options); }
---- a/js/requester.js
-+++ b/js/requester.js
-@@ -547124,9 +547124,6 @@
-                 _react2.default.createElement(_SettingsTabContent2.default, { key: _SettingsTypeConstants.SETTINGS_PROXY },
-                   _react2.default.createElement(_SettingsProxyContainer2.default, null)),
- 
--                _react2.default.createElement(_SettingsTabContent2.default, { key: _SettingsTypeConstants.SETTINGS_UPDATE },
--                  _react2.default.createElement(_SettingsUpdateContainer2.default, null)),
+--- a/js/RequesterModalContainer.js
++++ b/js/RequesterModalContainer.js
+@@ -12691,3 +12691,0 @@
+-              __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_5__components_settings_SettingsTabContent__["a" /* default */], { key: __WEBPACK_IMPORTED_MODULE_16__constants_SettingsTypeConstants__["j" /* SETTINGS_UPDATE */] },
+-                __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_10__SettingsUpdateContainer__["a" /* default */], null)),
 -
-                 _react2.default.createElement(_SettingsTabContent2.default, { key: _SettingsTypeConstants.SETTINGS_ABOUT },
-                   _react2.default.createElement(_SettingsAboutContainer2.default, null)))))));
- 
-@@ -547183,3 +547180,2 @@
-             _react2.default.createElement(_Tabs.Tab, { refKey: _SettingsTypeConstants.SETTINGS_PROXY }, 'Proxy'),
--            _react2.default.createElement(_Tabs.Tab, { refKey: _SettingsTypeConstants.SETTINGS_UPDATE }, 'Update'),
-             _react2.default.createElement(_Tabs.Tab, { refKey: _SettingsTypeConstants.SETTINGS_ABOUT }, 'About'))));
+@@ -12743,1 +12740,0 @@
+-          __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1__base_Tabs__["a" /* Tab */], { refKey: __WEBPACK_IMPORTED_MODULE_2__constants_SettingsTypeConstants__["j" /* SETTINGS_UPDATE */] }, 'Update'),
+--- a/js/vendor-shared.js
++++ b/js/vendor-shared.js
+@@ -79251,2 +79251,2 @@
+-window.DISABLE_ANALYTICS = false;
+-window.DISABLE_UPDATES = false;
++window.DISABLE_ANALYTICS = true;
++window.DISABLE_UPDATES = true;