From fac7a3f6e36b1313d18010c1bc8e96e94623c440 Mon Sep 17 00:00:00 2001 From: Martin Wagner Date: Wed, 29 Dec 2021 14:03:25 +0100 Subject: [PATCH] switched to meson --- .gitignore | 1 + README.md | 7 ++-- .../128x128/apps}/org.mpdevil.mpdevil.png | Bin .../16x16/apps}/org.mpdevil.mpdevil.png | Bin .../24x24/apps}/org.mpdevil.mpdevil.png | Bin .../256x256/apps}/org.mpdevil.mpdevil.png | Bin .../32x32/apps}/org.mpdevil.mpdevil.png | Bin .../48x48/apps}/org.mpdevil.mpdevil.png | Bin .../64x64/apps}/org.mpdevil.mpdevil.png | Bin .../org.mpdevil.mpdevil-lyrics-symbolic.svg | 0 .../apps}/org.mpdevil.mpdevil-symbolic.svg | 0 .../scalable/apps}/org.mpdevil.mpdevil.svg | 0 ...g.mpdevil.mpdevil-consume-symbolic-rtl.svg | 0 .../org.mpdevil.mpdevil-consume-symbolic.svg | 0 .../org.mpdevil.mpdevil-single-symbolic.svg | 0 data/meson.build | 14 ++++++++ data/org.mpdevil.mpdevil.desktop.in | 3 +- meson.build | 10 ++++++ po/LINGUAS | 2 ++ po/POTFILES.in | 3 +- po/meson.build | 1 + setup.py | 30 ------------------ src/meson.build | 10 ++++++ {bin => src}/mpdevil | 0 24 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 .gitignore rename data/icons/{128x128 => hicolor/128x128/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{16x16 => hicolor/16x16/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{24x24 => hicolor/24x24/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{256x256 => hicolor/256x256/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{32x32 => hicolor/32x32/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{48x48 => hicolor/48x48/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{64x64 => hicolor/64x64/apps}/org.mpdevil.mpdevil.png (100%) rename data/icons/{scalable => hicolor/scalable/actions}/org.mpdevil.mpdevil-lyrics-symbolic.svg (100%) rename data/icons/{scalable => hicolor/scalable/apps}/org.mpdevil.mpdevil-symbolic.svg (100%) rename data/icons/{scalable => hicolor/scalable/apps}/org.mpdevil.mpdevil.svg (100%) rename data/icons/{scalable => hicolor/scalable/status}/org.mpdevil.mpdevil-consume-symbolic-rtl.svg (100%) rename data/icons/{scalable => hicolor/scalable/status}/org.mpdevil.mpdevil-consume-symbolic.svg (100%) rename data/icons/{scalable => hicolor/scalable/status}/org.mpdevil.mpdevil-single-symbolic.svg (100%) create mode 100644 data/meson.build create mode 100644 meson.build create mode 100644 po/LINGUAS create mode 100644 po/meson.build delete mode 100644 setup.py create mode 100644 src/meson.build rename {bin => src}/mpdevil (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..13aeef2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/builddir diff --git a/README.md b/README.md index 11c88b7..faec19b 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Building -------- Build dependencies: -- DistUtilsExtra +- meson Dependencies: - Gtk3 @@ -70,8 +70,9 @@ Run: ```bash git clone https://github.com/SoongNoonien/mpdevil.git cd mpdevil -sudo python3 setup.py install -sudo glib-compile-schemas /usr/share/glib-2.0/schemas +meson builddir --prefix=/usr/local +sudo ninja -C builddir install +sudo glib-compile-schemas /usr/local/share/glib-2.0/schemas sudo gtk-update-icon-cache sudo update-desktop-database ``` diff --git a/data/icons/128x128/org.mpdevil.mpdevil.png b/data/icons/hicolor/128x128/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/128x128/org.mpdevil.mpdevil.png rename to data/icons/hicolor/128x128/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/16x16/org.mpdevil.mpdevil.png b/data/icons/hicolor/16x16/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/16x16/org.mpdevil.mpdevil.png rename to data/icons/hicolor/16x16/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/24x24/org.mpdevil.mpdevil.png b/data/icons/hicolor/24x24/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/24x24/org.mpdevil.mpdevil.png rename to data/icons/hicolor/24x24/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/256x256/org.mpdevil.mpdevil.png b/data/icons/hicolor/256x256/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/256x256/org.mpdevil.mpdevil.png rename to data/icons/hicolor/256x256/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/32x32/org.mpdevil.mpdevil.png b/data/icons/hicolor/32x32/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/32x32/org.mpdevil.mpdevil.png rename to data/icons/hicolor/32x32/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/48x48/org.mpdevil.mpdevil.png b/data/icons/hicolor/48x48/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/48x48/org.mpdevil.mpdevil.png rename to data/icons/hicolor/48x48/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/64x64/org.mpdevil.mpdevil.png b/data/icons/hicolor/64x64/apps/org.mpdevil.mpdevil.png similarity index 100% rename from data/icons/64x64/org.mpdevil.mpdevil.png rename to data/icons/hicolor/64x64/apps/org.mpdevil.mpdevil.png diff --git a/data/icons/scalable/org.mpdevil.mpdevil-lyrics-symbolic.svg b/data/icons/hicolor/scalable/actions/org.mpdevil.mpdevil-lyrics-symbolic.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil-lyrics-symbolic.svg rename to data/icons/hicolor/scalable/actions/org.mpdevil.mpdevil-lyrics-symbolic.svg diff --git a/data/icons/scalable/org.mpdevil.mpdevil-symbolic.svg b/data/icons/hicolor/scalable/apps/org.mpdevil.mpdevil-symbolic.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil-symbolic.svg rename to data/icons/hicolor/scalable/apps/org.mpdevil.mpdevil-symbolic.svg diff --git a/data/icons/scalable/org.mpdevil.mpdevil.svg b/data/icons/hicolor/scalable/apps/org.mpdevil.mpdevil.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil.svg rename to data/icons/hicolor/scalable/apps/org.mpdevil.mpdevil.svg diff --git a/data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic-rtl.svg b/data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-consume-symbolic-rtl.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic-rtl.svg rename to data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-consume-symbolic-rtl.svg diff --git a/data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic.svg b/data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-consume-symbolic.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic.svg rename to data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-consume-symbolic.svg diff --git a/data/icons/scalable/org.mpdevil.mpdevil-single-symbolic.svg b/data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-single-symbolic.svg similarity index 100% rename from data/icons/scalable/org.mpdevil.mpdevil-single-symbolic.svg rename to data/icons/hicolor/scalable/status/org.mpdevil.mpdevil-single-symbolic.svg diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..4e45b2b --- /dev/null +++ b/data/meson.build @@ -0,0 +1,14 @@ +i18n.merge_file( + input: 'org.mpdevil.mpdevil.desktop.in', + output: 'org.mpdevil.mpdevil.desktop', + type: 'desktop', + po_dir: '../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') +) + +install_data('org.mpdevil.mpdevil.appdata.xml', install_dir: join_paths(get_option('datadir'), 'metainfo')) +install_data('org.mpdevil.mpdevil.gschema.xml', install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')) +#install_data('help_overlay.ui', install_dir: join_paths(get_option('datadir'), 'share/mpdevil')) + +install_subdir('icons', install_dir: get_option('datadir')) diff --git a/data/org.mpdevil.mpdevil.desktop.in b/data/org.mpdevil.mpdevil.desktop.in index 8a527e8..3ddae46 100644 --- a/data/org.mpdevil.mpdevil.desktop.in +++ b/data/org.mpdevil.mpdevil.desktop.in @@ -1,11 +1,10 @@ [Desktop Entry] Name=mpdevil GenericName=MPD Client -_Comment=A simple music browser for MPD +Comment=A simple music browser for MPD Exec=mpdevil Icon=org.mpdevil.mpdevil Terminal=false Type=Application StartupNotify=true Categories=Audio;AudioVideo;Player;GTK - diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..6cd234e --- /dev/null +++ b/meson.build @@ -0,0 +1,10 @@ +project('mpdevil', + version: '1.4.1', + meson_version: '>= 0.47.0', +) + +i18n = import('i18n') + +subdir('data') +subdir('src') +subdir('po') diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..e437d52 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,2 @@ +de +nl diff --git a/po/POTFILES.in b/po/POTFILES.in index fc9ff4e..abe0498 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ [encoding: UTF-8] -bin/mpdevil +src/mpdevil data/org.mpdevil.mpdevil.desktop.in - diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..e5f1dea --- /dev/null +++ b/po/meson.build @@ -0,0 +1 @@ +i18n.gettext('mpdevil', preset: 'glib') diff --git a/setup.py b/setup.py deleted file mode 100644 index 2c42647..0000000 --- a/setup.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python3 -# -*- coding: utf-8 -*- -import DistUtilsExtra.auto - -DistUtilsExtra.auto.setup( - name='mpdevil', - version='1.4.1', # sync with bin/mpdevil - author="Martin Wagner", - author_email="martin.wagner.dev@gmail.com", - description=('A simple music browser for MPD'), - url="https://github.com/SoongNoonien/mpdevil", - license='GPL-3.0', - data_files=[ - ('share/metainfo/', ['data/org.mpdevil.mpdevil.appdata.xml']), - ('share/icons/hicolor/16x16/apps/', ['data/icons/16x16/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/24x24/apps/', ['data/icons/24x24/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/32x32/apps/', ['data/icons/32x32/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/48x48/apps/', ['data/icons/48x48/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/64x64/apps/', ['data/icons/64x64/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/128x128/apps/', ['data/icons/128x128/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/256x256/apps/', ['data/icons/256x256/org.mpdevil.mpdevil.png']), - ('share/icons/hicolor/scalable/apps/', ['data/icons/scalable/org.mpdevil.mpdevil.svg']), - ('share/icons/hicolor/scalable/apps/', ['data/icons/scalable/org.mpdevil.mpdevil-symbolic.svg']), - ('share/icons/hicolor/scalable/status/', ['data/icons/scalable/org.mpdevil.mpdevil-single-symbolic.svg']), - ('share/icons/hicolor/scalable/status/', ['data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic.svg']), - ('share/icons/hicolor/scalable/status/', ['data/icons/scalable/org.mpdevil.mpdevil-consume-symbolic-rtl.svg']), - ('share/icons/hicolor/scalable/actions/', ['data/icons/scalable/org.mpdevil.mpdevil-lyrics-symbolic.svg']), - ], -) - diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..731d030 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,10 @@ +#conf = configuration_data() + +#configure_file( +# input: 'mpdevil.py', +# output: 'mpdevil', +# configuration: conf, +# install_dir: join_paths(get_option('prefix'), get_option('bindir')) +#) + +install_data('mpdevil', install_dir: join_paths(get_option('prefix'), get_option('bindir'))) diff --git a/bin/mpdevil b/src/mpdevil similarity index 100% rename from bin/mpdevil rename to src/mpdevil