Fix packaging (amit9838#58)

* Fix snap packaging

- Fixed missing artifacts in snap version
- Use meson version >=0.61 for compatibility
  in ubuntu 22.04 (current version 0.61.2)
- Update project version to 1.0.1

* fixes as needed

* remove the conditions based on packaging format

---------

Co-authored-by: সৌম্যদীপ ঘোষ <[email protected]>

meson.build

@@ -1,6 +1,6 @@
 project('weather',
-          version: '0.1.0',
-    meson_version: '>= 0.62.0',
+          version: '1.0.1',
+    meson_version: '>= 0.61.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )
 

snap/snapcraft.yaml

@@ -1,17 +1,21 @@
 name: mousam
-base: core22
 adopt-info: mousam
+
 grade: stable
 confinement: strict
+
+base: core22
 architectures:
   - build-on: amd64
   - build-on: arm64
   - build-on: armhf
+
 parts:
   mousam:
-    plugin: meson
     source: https://github.com/amit9838/weather.git
-    #source-tag: 'v1.0.0'
+    source-depth: 1
+    #source-tag: used when there will be a new release with these fixes
+    plugin: meson
     meson-parameters: [ --prefix=/snap/mousam/current/usr ]
     override-pull: |
       craftctl default
@@ -45,5 +49,3 @@ apps:
       PYTHONPATH: $SNAP/usr/lib/python3.10/dist-packages:$PYTHONPATH
     plugs:
       - network
-      - network-status
-      - network-bind

src/constants.py

@@ -1,9 +1,7 @@
 import os
 
-icon_loc = "/app/share/icons/hicolor/scalable/weather_icons/"
 
-if  os.getenv('SNAP'):
-    icon_loc = f"{os.getenv('SNAP')}/usr/share/icons/hicolor/scalable/weather_icons/"
+icon_loc = "@icon_location@/share/icons/hicolor/scalable/weather_icons/"
 
 icons = {
     "0": icon_loc + "clear-day.svg",

src/meson.build

@@ -12,7 +12,7 @@ gnome.compile_resources('weather',
 python = import('python')
 
 conf = configuration_data()
-conf.set('PYTHON', python.find_installation('python3').path())
+conf.set('PYTHON', python.find_installation('python3').full_path())
 conf.set('VERSION', meson.project_version())
 conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set('pkgdatadir', pkgdatadir)
@@ -26,7 +26,6 @@ configure_file(
   install_mode: 'r-xr--r--'
 )
 
-
 weather_sources = [
   'main.py',
   'weather.py',
@@ -60,6 +59,15 @@ weather_sources = [
   'windowLocations.py'
 ]
 
+install_data(weather_sources, install_dir: moduledir)
 
+icon_conf = configuration_data()
+icon_conf.set('icon_location', get_option('prefix'))
 
-install_data(weather_sources, install_dir: moduledir)
+configure_file(
+  input: 'constants.py',
+  output: 'constants.py',
+  configuration: icon_conf,
+  install: true,
+  install_dir: moduledir
+)