epm repack: switch to add_electron_deps and add_chromium_deps

repack.d/Pencil.sh

@@ -12,12 +12,10 @@ PRODUCTCUR=Pencil
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
 
 fix_desktop_file
 
 subst '1iConflicts: pencil' $SPEC
-
-set_autoreq 'yes'

repack.d/brave-browser-beta.sh

@@ -21,5 +21,5 @@ add_bin_commands
 
 use_system_xdg
 
-add_deps
+add_chromium_deps
 

repack.d/brave-browser-dev.sh

@@ -21,5 +21,5 @@ add_bin_commands
 
 use_system_xdg
 
-add_deps
+add_chromium_deps
 

repack.d/brave-browser-nightly.sh

@@ -21,5 +21,5 @@ add_bin_commands
 
 use_system_xdg
 
-add_deps
+add_chromium_deps
 

repack.d/brave-browser.sh

@@ -21,7 +21,7 @@ add_bin_commands
 
 use_system_xdg
 
-add_deps
+add_chromium_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 

repack.d/chat.sh

@@ -20,8 +20,6 @@ subst "s|/opt/Synology Chat/||" $BUILDROOT/usr/share/applications/$PRODUCT.deskt
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
-
-set_autoreq 'yes'

repack.d/chromium-gost-stable.sh

@@ -27,7 +27,7 @@ add_bin_commands
 
 use_system_xdg
 
-install_deps
+add_chromium_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
@@ -46,5 +46,3 @@ else
        exec -a "\$0" "\$HERE/chrome" "\$@"
 fi
 EOF
-
-set_autoreq 'yes'

repack.d/common-chromium-browser.sh

@@ -56,19 +56,33 @@ cleanup()
     remove_file /usr/share/menu/$PRODUCTCUR.menu
 }
 
-
-install_deps()
+add_electron_deps()
 {
-    # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
-    install_requires at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango \
-            libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
+    add_unirequires "file grep sed which xdg-utils xprop"
+    add_unirequires "libpthread.so.0 libstdc++.so.6"
+    add_unirequires "libX11.so.6 libXcomposite.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXrandr.so.2 libxcb.so.1 libxkbcommon.so.0"
+    add_unirequires "libasound.so.2 libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0"
+    add_unirequires "libcairo.so.2 libcups.so.2 libdbus-1.so.3"
+    add_unirequires "libdrm.so.2 libexpat.so.1 libfontconfig.so.1 libgbm.so.1"
+    add_unirequires "libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-3.so.0 libpango-1.0.so.0"
+    add_unirequires "libnspr4.so libnss3.so libnssutil3.so libsmime3.so"
+
 }
 
-add_deps()
+add_chromium_deps()
 {
-    [ "$(epm print info -s)" = "alt" ] || return
-    add_requires at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango
-    add_requires libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
+    add_unirequires "file grep sed which xdg-utils xprop"
+    add_unirequires "libpthread.so.0 libstdc++.so.6"
+    add_unirequires "libatk-bridge-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 libatk-1.0.so.0 libatspi.so.0"
+    add_unirequires "libasound.so.2 libatopology.so.2 libcairo.so.2 libcups.so.2 libdbus-1.so.3 libdrm.so.2 libexpat.so.1 libgbm.so.1 libgdk_pixbuf-2.0.so.0"
+    add_unirequires "libpango-1.0.so.0 libpangocairo-1.0.so.0 libpangoft2-1.0.so.0 libpangoxft-1.0.so.0"
+    add_unirequires "libgio-2.0.so.0 libgdk-3.so.0 libgtk-3.so.0 libnspr4.so libplc4.so libplds4.so libfreebl3.so libfreeblpriv3.so libnss3.so"
+    add_unirequires "libsmime3.so libsoftokn3.so libssl3.so libsecret-1.so.0"
+    add_unirequires "libX11.so.6 libxcb.so.1 libXcomposite.so.1 libXcursor.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXi.so.6 libXrandr.so.2 libXrender.so.1 libXtst.so.6"
+
+    #[ "$(epm print info -s)" = "alt" ] || return
+    #add_requires at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango
+    #add_requires libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
 }
 
 

repack.d/discord.sh

@@ -14,7 +14,7 @@ move_to_opt
 
 fix_chrome_sandbox
 
-add_deps
+add_electron_deps
 
 rm usr/bin/$PRODUCT
 add_bin_link_command $PRODUCTCUR $PRODUCTDIR/$PRODUCTCUR

repack.d/domination-client.sh

@@ -16,9 +16,6 @@ pack_dir $PRODUCTDIR
 
 add_bin_link_command
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
-
-set_autoreq 'yes'
-

repack.d/express.sh

@@ -12,9 +12,6 @@ add_bin_link_command
 
 fix_desktop_file
 
-install_deps
-#add_deps
+add_electron_deps
 
 fix_chrome_sandbox
-
-set_autoreq 'yes'

repack.d/generic-appimage.sh

@@ -93,7 +93,7 @@ if [ -f v8_context_snapshot.bin ] ; then
     echo "electron based application detected, adding requires ..."
     . $(dirname $0)/common-chromium-browser.sh
     # don't use install: we disabled AutoReq before
-    add_deps
+    add_electron_deps
 fi
 
 # ignore embedded libs

repack.d/geogebra-classic.sh

@@ -11,8 +11,6 @@ PREINSTALL_PACKAGES="python3 rpm-build-python3"
 
 . $(dirname $0)/common-chromium-browser.sh
 
-set_autoreq 'yes,noshell,nomonolib,nomono,nopython'
-
 subst '1iBuildRequires:rpm-build-python3' $SPEC
 subst "1i%add_python3_path $PRODUCTDIR" $SPEC
 
@@ -23,4 +21,4 @@ cleanup
 
 fix_chrome_sandbox
 
-install_deps
+add_electron_deps

repack.d/gitkraken.sh

@@ -11,7 +11,7 @@ PRODUCT=gitkraken
 rm -v ./usr/bin/gitkraken
 add_bin_link_command
 
-install_deps
+add_electron_deps
 
 move_to_opt
 
@@ -26,4 +26,4 @@ add_findreq_skiplist "$PRODUCTDIR/resources/app.asar.unpacked/node_modules/@msgp
 add_requires libXScrnSaver
 
 # TODO: replace gitkraken/resources/app.asar.unpacked/git with system's one optionally?
-set_autoreq 'yes,noperl'
+#set_autoreq 'yes,noperl'

repack.d/google-chrome-stable.sh

@@ -27,6 +27,4 @@ subst 's|GenericName\[ru\]=Веб-браузер|GenericName[ru]=Веб-брау
 
 fix_desktop_file /usr/bin/google-chrome-stable
 
-install_deps
-
-set_autoreq 'yes'
+add_chromium_deps

repack.d/iptvnator.sh

@@ -11,8 +11,6 @@ PRODUCTDIR=/opt/IPTVnator
 
 cleanup
 fix_chrome_sandbox
-install_deps
+add_electron_deps
 
 add_bin_link_command
-
-set_autoreq 'yes'

repack.d/lycheeslicer.sh

@@ -6,14 +6,12 @@ SPEC="$2"
 PRODUCT=lycheeslicer
 PRODUCTDIR=/opt/LycheeSlicer
 
-PREINSTALL_PACKAGES="at-spi2-atk coreutils glib2 libalsa libatk libat-spi2-core libcairo libcups libdbus libdrm libexpat libgbm libgio libGL libgtk+3 libnspr libnss libpango libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libXrandr zlib"
-
 . $(dirname $0)/common-chromium-browser.sh
 
 add_bin_link_command
 #add_bin_link_command $PRODUCTCUR $PRODUCT
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
 
@@ -21,6 +19,3 @@ fix_desktop_file
 
 # ignore embedded libs
 filter_from_requires libQt5 node seamonkey thunderbird
-
-set_autoreq 'yes'
-

repack.d/microsoft-edge-stable.sh

@@ -27,7 +27,7 @@ add_bin_commands
 
 use_system_xdg
 
-install_deps
+add_chromium_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
@@ -40,5 +40,3 @@ epm assure patchelf || exit
 for i in $BUILDROOT$PRODUCTDIR/libmip_*.so ; do
     [ "$(a= patchelf --print-interpreter $i)" = "/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" ] && a= patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $i
 done
-
-set_autoreq 'yes'

repack.d/mobirise.sh

@@ -17,6 +17,4 @@ fix_desktop_file
 
 fix_chrome_sandbox
 
-install_deps
-
-set_autoreq 'yes'
+add_electron_deps

repack.d/obsidian.sh

@@ -12,21 +12,12 @@ PRODUCTDIR=/opt/Obsidian
 
 cleanup
 
-#add_bin_commands
-
 if [ ! -f "$BUILDROOT/usr/bin/$PRODUCT" ] ; then
     add_bin_exec_command
 fi
 
-install_deps
+add_chromium_deps
 
 fix_chrome_sandbox
 
 fix_desktop_file
-
-#epm assure patchelf || exit
-#for i in $BUILDROOT$PRODUCTDIR/$PRODUCT ; do
-#    a= patchelf --set-rpath "$PRODUCTDIR" $i
-#done
-
-set_autoreq 'yes'

repack.d/opera-stable.sh

@@ -55,17 +55,6 @@ add_bin_commands
 
 fix_chrome_sandbox $PRODUCTDIR/opera_sandbox
 
-# TODO: it is possible we will not require this if link bin->/opt/dir/name is relative
-# fix to support pack links in /usr/bin (may be this is a bug?)
-if epm assure patchelf ; then
-for i in $BUILDROOT$PRODUCTDIR/$PRODUCTCUR ; do
-    a= patchelf --set-rpath "$PRODUCTDIR/lib_extra:$PRODUCTDIR" $i
-done
-fi
-
 #subst '1iRequires: chromium-codecs-ffmpeg-extra >= 103' $SPEC
 
-install_deps
-
-
-set_autoreq 'yes'
+add_chromium_deps

repack.d/portmaster.sh

@@ -31,6 +31,4 @@ fix_chrome_sandbox $PRODUCTDIR/updates/linux_amd64/app/$p/chrome-sandbox
 
 pack_file $PRODUCTDIR/updates
 
-install_deps
-
-set_autoreq 'yes'
+add_electron_deps

repack.d/rocketchat.sh

@@ -12,15 +12,9 @@ PRODUCTDIR=/opt/Rocket.Chat
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
 
-subst "s|$PRODUCTDIR/||" $BUILDROOT/usr/share/applications/rocketchat-desktop.desktop
+fix_desktop_file
 
-#epm assure patchelf || exit
-#for i in $BUILDROOT$PRODUCTDIR/$PRODUCT ; do
-#    a= patchelf --set-rpath "$PRODUCTDIR" $i
-#done
-
-set_autoreq 'yes'

repack.d/signal-desktop.sh

@@ -10,9 +10,7 @@ PRODUCTDIR=/opt/$PRODUCTCUR
 
 . $(dirname $0)/common-chromium-browser.sh
 
-install_deps
-
-set_autoreq 'yes'
+add_electron_deps
 
 subst "s|.*/etc/apt.*||" $SPEC
 subst '/linux-arm64/d' $SPEC

repack.d/slack.sh

@@ -13,10 +13,8 @@ PRODUCTDIR=/usr/lib/slack
 
 fix_chrome_sandbox
 
-install_deps
+add_electron_deps
 
 cleanup
 
 add_bin_exec_command
-
-set_autoreq 'yes'

repack.d/sputnik-browser-stable.sh

@@ -23,6 +23,4 @@ add_bin_commands
 
 use_system_xdg
 
-install_deps
-
-set_autoreq 'yes'
+add_chromium_deps

repack.d/ungoogled-chromium.sh

@@ -46,6 +46,4 @@ set_alt_alternatives 65
 [ -f .$PRODUCTDIR/chrome_sandbox ] && move_file $PRODUCTDIR/chrome_sandbox $PRODUCTDIR/chrome-sandbox
 fix_chrome_sandbox
 
-install_deps
-
-set_autoreq 'yes'
+add_chromium_deps

repack.d/vinteo.desktop.sh

@@ -15,7 +15,7 @@ fix_desktop_file
 
 fix_chrome_sandbox
 
-install_deps
+add_electron_deps
 
 add_findreq_skiplist "/opt/VinteoDesktop/resources/app.asar.unpacked/node_modules/@serialport/bindings-cpp/prebuilds/*/*.node"
 
@@ -29,4 +29,3 @@ case "$(epm print info -e)" in
         ;;
 esac
 
-set_autoreq 'yes'

repack.d/vivaldi-snapshot.sh

@@ -23,13 +23,11 @@ use_system_xdg
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
-install_deps
+add_chromium_deps
 
 add_findreq_skiplist $PRODUCTDIR/update-ffmpeg
 
 filter_from_requires '\\/opt\\/google\\/chrome\\/WidevineCdm'
 
-set_autoreq 'yes'
-
 echo "You also can install chrome via epm play chrome to use WidevineCdm"
 

repack.d/vivaldi-stable.sh

@@ -23,12 +23,10 @@ use_system_xdg
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
-install_deps
+add_chromium_deps
 
 add_findreq_skiplist $PRODUCTDIR/update-ffmpeg
 
 filter_from_requires '\\/opt\\/google\\/chrome\\/WidevineCdm'
 
-set_autoreq 'yes'
-
 echo "You also can install chrome via epm play chrome to use WidevineCdm"

repack.d/vk.sh

@@ -13,9 +13,7 @@ move_to_opt
 
 fix_chrome_sandbox
 
-install_deps
-
-set_autoreq 'yes'
+add_electron_deps
 
 remove_dir /etc
 

repack.d/yandex-browser-beta.sh

@@ -28,8 +28,6 @@ add_bin_commands
 
 use_system_xdg
 
-install_deps
+add_chromium_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
-
-set_autoreq 'yes'

repack.d/yandex-browser-stable.sh

@@ -28,8 +28,6 @@ add_bin_commands
 
 use_system_xdg
 
-install_deps
+add_chromium_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
-
-set_autoreq 'yes'

repack.d/yaradio-yamusic.sh

@@ -11,7 +11,7 @@ PRODUCTDIR=/opt/YaMusic.app
 add_bin_link_command
 #add_bin_link_command $PRODUCTCUR $PRODUCT
 
-install_deps
+add_electron_deps
 
 fix_chrome_sandbox
 
@@ -21,5 +21,3 @@ if [ -f usr/share/icons/hicolor/0x0/apps/yaradio-yamusic.png ] ; then
     install_file /usr/share/icons/hicolor/0x0/apps/yaradio-yamusic.png /usr/share/icons/hicolor/256x256/apps/yaradio-yamusic.png
     remove_dir /usr/share/icons/hicolor/0x0/
 fi
-
-set_autoreq 'yes'