cleanup a bit more gPodder specific stuff

Author: elelay

bundle.sh

@@ -5,7 +5,7 @@ set -e
 source env.sh
 
 echo compiling native launcher...
-echo 'clang -mmacosx-version-min=10.9 -framework Foundation -L$PREFIX/lib `python3-config --cflags --ldflags --embed` -o $PREFIX/bin/gpodder-launcher misc/bundle/launcher.m'| jhbuild shell
+echo 'clang -mmacosx-version-min=10.9 -framework Foundation -L$PREFIX/lib `python3-config --cflags --ldflags --embed` -o $PREFIX/bin/python-launcher misc/bundle/launcher.m'| jhbuild shell
 
 echo creating app...
 jhbuild run gtk-mac-bundler misc/bundle/gpodder.bundle

misc/adjust-modifiers.xsl

@@ -8,10 +8,8 @@
     <string>gpodder</string>
     <key>CFBundleGetInfoString</key>
     <string>gPodder @VERSION@ @COPYRIGHT@</string>
-    <key>CFBundleIconFile</key>
-    <string>gPodder.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>org.gpodder</string>
+    <string>org.gpodder.pythonbase</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundlePackageType</key>

misc/bundle/Info.plist

@@ -40,7 +40,7 @@
       so we use the original and ignore it. If your original will work
       in the bundle, you can use this instead.-->
  <main-binary>
-     ${prefix}/bin/gpodder-launcher
+     ${prefix}/bin/python-launcher
  </main-binary>
 
   <!-- We need to pack our own Python to avoid compatibility problems. -->
@@ -95,11 +95,6 @@
     ${prefix}/share/locale
   </translations>
 
-  <!-- don't bundle gpodder translations
-  <translations name="gpodder">
-    ${prefix}/share/locale
-  </translations> -->
-
   <!-- Be careful, only to pick required python modules  -->
 
   <!-- standard install minus unused -->
@@ -141,36 +136,6 @@
   </data>
   <data>${prefix}/lib/python3.8/site-packages/cairo/*.py</data>
 
-  <!-- gpodder pure python deps
-  <data>${prefix}/lib/python3.8/site-packages/certifi</data>
-  <data>${prefix}/lib/python3.8/site-packages/chardet</data>
-  <data>${prefix}/lib/python3.8/site-packages/gpodder</data>
-  <data>${prefix}/lib/python3.8/site-packages/idna</data>
-  <data>${prefix}/lib/python3.8/site-packages/mutagen</data>
-  <data>${prefix}/lib/python3.8/site-packages/mygpoclient</data>
-  <data>${prefix}/lib/python3.8/site-packages/html5lib</data>
-  <data>${prefix}/lib/python3.8/site-packages/podcastparser.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/socks.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/sockshandler.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/requests</data>
-  <data>${prefix}/lib/python3.8/site-packages/six.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/socks.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/sockshandler.py</data>
-  <data>${prefix}/lib/python3.8/site-packages/urllib3</data>
-  <data>${prefix}/lib/python3.8/site-packages/webencodings</data>
-  <data>${prefix}/lib/python3.8/site-packages/youtube_dl</data>
-  -->
-	
-
-  <!-- Fake dbus module.
-       d-bus can be built and bundled, but it doesn't add any service
-       so it's not bundled to reduce the App size.
-       If somebody requires it, it will be added.
-  <data dest="${bundle}/Contents/Resources/lib/python3.8/site-packages/dbus">
-    ${env:JHBUILD_SOURCE}/gpodder/tools/fake-dbus-module/dbus
-  </data>
-    -->
-
   <binary>
     ${prefix}/lib/python3.8/lib-dynload/*.so
   </binary>
@@ -254,45 +219,5 @@
   <data>${prefix}/lib/python3.8/distutils</data>
   <data>${prefix}/lib/python3.8/site-packages/pip</data>
   <data>${prefix}/lib/python3.8/xmlrpc</data>
-  <!--<data>${prefix}/lib/python3.8/ensurepip</data>-->
-  <!-- setuptools -->
-  <!-- <data>${prefix}/lib/python3.8/site-packages/pkg_resources</data>
-  <data>${prefix}/lib/python3.8/site-packages/setuptools</data> -->
-
-
-  <!-- gpodder contents
-  <data>
-    ${prefix}/bin/gpodder
-  </data>
-  <data>
-    ${prefix}/bin/gpo
-  </data>
-  <data>
-    ${prefix}/bin/gpodder-migrate2tres
-  </data>
-
-
-  <data>
-    ${prefix}/share/gpodder
-  </data>
-
-  <data>
-    ${prefix}/share/man/man1/gpo.1
-  </data>
-  <data>
-    ${prefix}/share/man/man1/gpodder.1
-  </data>
-  <data>
-    ${prefix}/share/man/man1/gpodder-migrate2tres.1
-  </data>
-
-  <data dest="${bundle}/Contents/Resources/gPodder.icns">
-    ${env:JHBUILD_SOURCE}/gpodder/tools/mac-osx/icon.icns
-  </data>
-  <!- - gPodder icon in the about dialog (gpodder.icon_file initialised in gpodder script) - ->
-  <data dest="${bundle}/Contents/Resources/share/icons/hicolor/scalable/apps">
-  	${prefix}/share/icons/hicolor/scalable/apps/gpodder.svg
-  </data>
-  -->
 
 </app-bundle>