summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilal Elmoussaoui <bil.elmoussaoui@gmail.com>2018-01-23 02:35:50 +0100
committerMarinus Schraal <mschraal@gnome.org>2018-02-23 21:54:10 +0100
commitfc70b1e8e4396a0c2a4a3abc986daaa810e02ab1 (patch)
treebc82c18b9e5ffadf2cb8a1b6b1dda903b20d2da1
parent19ded54da09702e0b8ccd244c630bfad5e8cca78 (diff)
Switch to meson build system
- Use Reverse Domain Name Notation where possible - Move libgd to subprojects/libgd - Use 'local-music' for running in meson build dir Final fix-ups by Marinus Schraal <mschraal@gnome.org>. Closes: #1
-rw-r--r--.gitignore3
-rw-r--r--.gitlab-ci.yml20
-rw-r--r--.gitmodules4
-rw-r--r--AUTHORS0
-rw-r--r--AUTHORS.in23
-rw-r--r--ChangeLog0
-rw-r--r--INSTALL370
-rw-r--r--LICENSE (renamed from COPYING)0
-rw-r--r--Makefile.am69
-rw-r--r--NEWS.md (renamed from NEWS)0
-rw-r--r--README1
-rw-r--r--README.md12
-rwxr-xr-xautogen.sh26
-rw-r--r--configure.ac66
-rw-r--r--data/AboutDialog.ui.in2
-rw-r--r--data/Makefile.am84
-rw-r--r--data/icons/hicolor/16x16/apps/org.gnome.Music.png (renamed from data/icons/hicolor/16x16/apps/gnome-music.png)bin1158 -> 1158 bytes
-rw-r--r--data/icons/hicolor/22x22/apps/org.gnome.Music.png (renamed from data/icons/hicolor/22x22/apps/gnome-music.png)bin1536 -> 1536 bytes
-rw-r--r--data/icons/hicolor/256x256/apps/org.gnome.Music.png (renamed from data/icons/hicolor/256x256/apps/gnome-music.png)bin93983 -> 93983 bytes
-rw-r--r--data/icons/hicolor/32x32/apps/org.gnome.Music.png (renamed from data/icons/hicolor/32x32/apps/gnome-music.png)bin2595 -> 2595 bytes
-rw-r--r--data/icons/hicolor/48x48/apps/org.gnome.Music.png (renamed from data/icons/hicolor/48x48/apps/gnome-music.png)bin4081 -> 4081 bytes
-rw-r--r--data/icons/hicolor/org.gnome.Music.blend (renamed from data/icons/hicolor/gnome-music.blend)bin630969 -> 630969 bytes
-rw-r--r--data/icons/hicolor/org.gnome.Music.svg (renamed from data/icons/hicolor/gnome-music.svg)0
-rw-r--r--data/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg (renamed from data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg)0
-rw-r--r--data/meson.build79
-rw-r--r--data/org.gnome.Music.appdata.xml.in2
-rw-r--r--data/org.gnome.Music.desktop.in2
-rw-r--r--data/org.gnome.Music.gresource.xml (renamed from data/gnome-music.gresource.xml)0
-rw-r--r--data/org.gnome.Music.gschema.xml2
-rwxr-xr-x[-rw-r--r--]gnome-music.in44
-rw-r--r--gnomemusic/Makefile.am19
-rw-r--r--gnomemusic/views/Makefile.am13
-rw-r--r--gnomemusic/widgets/Makefile.am12
-rw-r--r--help/LINGUAS14
-rw-r--r--help/Makefile.am22
-rw-r--r--help/meson.build17
-rw-r--r--meson.build93
-rwxr-xr-xmeson_post_conf.py12
-rwxr-xr-xmeson_post_install.py21
-rw-r--r--po/Makevars78
-rw-r--r--po/meson.build1
m---------subprojects/libgd (renamed from libgd)0
42 files changed, 282 insertions, 829 deletions
diff --git a/.gitignore b/.gitignore
index 2c302203..7200d973 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*~
-libgd/
+builddir/
+subprojects/libgd/
/*.bak
/*.lo
/*.o
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d427c5f..2f53a321 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,27 +5,27 @@ stages:
- deploy
variables:
- DEPENDENCIES: python3 autoconf-archive gettext-devel git pygobject3
+ DEPENDENCIES: python3 redhat-rpm-config gettext-devel git pygobject3
pygobject3-devel python3-gobject python3-cairo-devel
- redhat-rpm-config gtk3-devel gobject-introspection-devel
- tracker-devel gnome-common which libmediaart-devel grilo-devel
- gnome-online-accounts-devel
+ gtk3-devel gobject-introspection-devel tracker-devel
+ which libmediaart-devel grilo-devel gnome-online-accounts-devel
+ meson ninja-build
build:
stage: build
script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
- git submodule update --init
- - ./autogen.sh
- - make
+ - meson builddir
+ - ninja -C builddir
deploy:
stage: deploy
script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
- git submodule update --init
- - ./autogen.sh
- - make distcheck
+ - meson builddir
+ - ninja dist -C builddir
only:
- tags
@@ -33,11 +33,11 @@ pyflakes:
stage: check
script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck python3-pyflakes
- - python3-pyflakes .
+ - python3-pyflakes gnomemusic/
pep8:
stage: check
script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck python3-pep8
- - python3-pep8 --ignore=W503,E402 --show-source --show-pep8 --exclude=mpris.py,grilo.py,query.py,player.py,window.py .
+ - python3-pep8 --ignore=W503,E402 --show-source --show-pep8 --exclude=mpris.py,grilo.py,query.py,player.py,window.py gnomemusic/
allow_failure: true
diff --git a/.gitmodules b/.gitmodules
index bfd964e3..e91a9d2e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libgd"]
- path = libgd
+[submodule "subprojects/libgd"]
+ path = subprojects/libgd
url = git://git.gnome.org/libgd
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29b..00000000
--- a/AUTHORS
+++ /dev/null
diff --git a/AUTHORS.in b/AUTHORS.in
deleted file mode 100644
index 98d5366e..00000000
--- a/AUTHORS.in
+++ /dev/null
@@ -1,23 +0,0 @@
- GNOME Music Authors
- ===================
-
-GNOME Music was initially written by:
-
- César García Tapia <cesar.garcia.tapia@openshine.com>
- Seif Lotfy <seif@lotfy.com>
- Vadim Rutkovsky <vrutkovs@redhat.com>
-
-GNOME Music is currently maintained by:
-
- Felipe Borges <felipeborges@gnome.org>
- Marinus Schraal <mschraal@gnome.org>
-
-"Magic of the vinyl" photo by Sami Pyylampi (License: CC-BY-SA 2.0)
-
-Patches have been received from:
-
-#authorslist#
-
- ... send patches to get your name here ...
-
--- End
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29b..00000000
--- a/ChangeLog
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 20998407..00000000
--- a/INSTALL
+++ /dev/null
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below. The lack of an optional feature in a given package is not
-necessarily a bug. More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
- this time using the binaries in their final installed location.
- This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
- root privileges, verifies that the installation completed
- correctly.
-
- 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 7. Often, you can also type `make uninstall' to remove the installed
- files again. In practice, not all packages have tested that
- uninstallation works correctly, even though it is required by the
- GNU Coding Standards.
-
- 8. Some packages, particularly those that use Automake, provide `make
- distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS
- KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
-
- CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
diff --git a/COPYING b/LICENSE
index 2dc06fe3..2dc06fe3 100644
--- a/COPYING
+++ b/LICENSE
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 8f038be4..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd
-NULL =
-
-bin_SCRIPTS = gnome-music
-
-SUBDIRS = libgd gnomemusic data po help
-
-EXTRA_DIST = \
- AUTHORS.in \
- README.md \
- gnome-music.in
- $(NULL)
-
-CLEANFILES = \
- $(bin_SCRIPTS)
- $(NULL)
-
-MAINTAINERCLEANFILES = \
- $(srcdir)/AUTHORS \
- $(srcdir)/INSTALL \
- $(srcdir)/aclocal.m4 \
- $(srcdir)/autoscan.log \
- $(srcdir)/compile \
- $(srcdir)/config.guess \
- $(srcdir)/config.h.in \
- $(srcdir)/config.sub \
- $(srcdir)/configure.scan \
- $(srcdir)/depcomp \
- $(srcdir)/install-sh \
- $(srcdir)/ltmain.sh \
- $(srcdir)/missing \
- $(srcdir)/mkinstalldirs \
- $(NULL)
-
-GITIGNOREFILES = \
- m4 \
- $(NULL)
-
-dist-hook: gen-AUTHORS
-
-gen-AUTHORS:
- $(AM_V_GEN)if test -d $(srcdir)/.git; then \
- out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
- perl -p -e "s/#authorslist#// and print '$$out'" \
- < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
- mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
- fi
-
-gnome-music: gnome-music.in Makefile
- $(AM_V_GEN)sed \
- -e s!\@srcdir\@!$(abs_top_srcdir)! \
- -e s!\@prefix\@!$(prefix)! \
- -e s!\@datadir\@!$(datadir)! \
- -e s!\@pkgdatadir\@!$(pkgdatadir)! \
- -e s!\@libexecdir\@!$(libexecdir)! \
- -e s!\@libdir\@!$(libdir)! \
- -e s!\@pkglibdir\@!$(pkglibdir)! \
- -e s!\@localedir\@!$(localedir)! \
- -e s!\@pythondir\@!$(pythondir)! \
- -e s!\@pyexecdir\@!$(pyexecdir)! \
- -e s!\@PACKAGE\@!$(PACKAGE)! \
- -e s!\@VERSION\@!$(VERSION)! \
- < $< > $@
- chmod a+x $@
-
-all-local: gnome-music
-
--include $(top_srcdir)/git.mk
-
diff --git a/NEWS b/NEWS.md
index 30fff6b2..30fff6b2 100644
--- a/NEWS
+++ b/NEWS.md
diff --git a/README b/README
deleted file mode 100644
index 96dc92fb..00000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-See README.md
diff --git a/README.md b/README.md
index 5fea6d22..41efa9cd 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,18 @@ You can join the developers on IRC: [#gnome-music](irc://irc.gnome.org/gnome-mus
Follow the guide at https://wiki.gnome.org/Newcomers/ and choose Music as your project. There are bugs labeled for newcomers, which should provide an easy entry point. Of course, feel free to pick something more challenging. Pick bugs if you can, the goal is to make the current Music experience sound & stable and only then extend it's functionality.
+### Build Music
+
+Music uses the [meson](http://mesonbuild.com/) build system.
+
+```
+meson builddir
+cd builddir
+ninja
+```
+
+Then you can either run in the build dir by doing `./local-music` or install system-wide by doing `ninja install`.
+
# Coding style
GNOME Music is written in Python and aspires to adhere to the coding style described in the python style guide [PEP-8](https://www.python.org/dev/peps/pep-0008/).
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 89b6c7b2..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ACLOCAL_FLAGS="-I libgd ${ACLOCAL_FLAGS}"
-
-test -f $srcdir/configure.ac || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level gnome-music directory"
- exit 1
-}
-
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from GNOME Git (or from"
- echo "your OS vendor's package manager)."
- exit 1
-}
-
-(cd "$srcdir" ;
-test -d m4 || mkdir m4/ ;
-git submodule update --init --recursive ;
-)
-touch AUTHORS
-. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 89855d55..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,66 +0,0 @@
-AC_PREREQ(2.63)
-AC_INIT([gnome-music],
- [3.27.90],
- [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music],
- [gnome-music],
- [https://wiki.gnome.org/Apps/Music])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects])
-AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AM_PATH_PYTHON([3.3])
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
-GETTEXT_PACKAGE=gnome-music
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
- [The prefix for our gettext translation domains.])
-
-YELP_HELP_INIT
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-LT_INIT([disable-static])
-
-LIBGD_INIT([main-view gir tagged-entry])
-
-PKG_PROG_PKG_CONFIG([0.22])
-
-GLIB_GSETTINGS
-AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
-GOBJECT_INTROSPECTION_CHECK([1.35.9])
-PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.19.3])
-PKG_CHECK_MODULES([MEDIAART], [libmediaart-2.0 >= 1.9.1])
-PKG_CHECK_MODULES([GOA], [goa-1.0])
-
-PYGOBJECT_MIN_VERSION=3.21.1
-PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= $PYGOBJECT_MIN_VERSION])
-
-PYCAIRO_MIN_VERSION=1.14.0
-PKG_CHECK_MODULES(PYCAIRO, [py3cairo >= $PYCAIRO_MIN_VERSION])
-
-TRACKER_MIN_VERSION=1.99.1
-PKG_CHECK_MODULES(TRACKER, [tracker-sparql-2.0 >= $TRACKER_MIN_VERSION])
-
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
-GRL_MIN_VERSION=0.3.4
-PKG_CHECK_MODULES(GRL, grilo-0.3 >= $GRL_MIN_VERSION)
-
-AC_CONFIG_FILES([
- Makefile
- data/Makefile
- help/Makefile
- data/AboutDialog.ui
- gnomemusic/Makefile
- gnomemusic/views/Makefile
- gnomemusic/widgets/Makefile
- po/Makefile.in
- libgd/Makefile
-])
-AC_OUTPUT
diff --git a/data/AboutDialog.ui.in b/data/AboutDialog.ui.in
index ed299dbb..9dc9f294 100644
--- a/data/AboutDialog.ui.in
+++ b/data/AboutDialog.ui.in
@@ -127,7 +127,7 @@ Yosef Or Boczko
Yuras Shumovich
Yuri Myasoedov
</property>
- <property name="logo_icon_name">gnome-music</property>
+ <property name="logo_icon_name">org.gnome.Music</property>
<property name="wrap_license">True</property>
</object>
</interface>
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 264e33e9..00000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate-dependencies $(srcdir)/gnome-music.gresource.xml)
-gnome-music.gresource: gnome-music.gresource.xml $(resource_files)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) $<
-
-resourcedir = $(pkgdatadir)
-resource_DATA = gnome-music.gresource
-
-appsdir = $(datadir)/applications
-apps_in_files = org.gnome.Music.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-$(apps_DATA): $(apps_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-appdatadir = $(datadir)/metainfo
-appdata_in_files = org.gnome.Music.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-$(appdata_DATA): $(appdata_in_files)
- $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-man1_MANS = gnome-music.1
-
-# hicolor icons
-hicolor_icon16dir = $(datadir)/icons/hicolor/16x16/apps
-hicolor_icon16_DATA = icons/hicolor/16x16/apps/gnome-music.png
-hicolor_icon22dir = $(datadir)/icons/hicolor/22x22/apps
-hicolor_icon22_DATA = icons/hicolor/22x22/apps/gnome-music.png
-hicolor_icon32dir = $(datadir)/icons/hicolor/32x32/apps
-hicolor_icon32_DATA = icons/hicolor/32x32/apps/gnome-music.png
-hicolor_icon48dir = $(datadir)/icons/hicolor/48x48/apps
-hicolor_icon48_DATA = icons/hicolor/48x48/apps/gnome-music.png
-hicolor_icon256dir = $(datadir)/icons/hicolor/256x256/apps
-hicolor_icon256_DATA = icons/hicolor/256x256/apps/gnome-music.png
-hicolor_iconsymbolicdir = $(datadir)/icons/hicolor/symbolic/apps
-hicolor_iconsymbolic_DATA = icons/hicolor/symbolic/apps/gnome-music-symbolic.svg
-hicolor_icon_files = \
- $(hicolor_icon16_DATA) \
- $(hicolor_icon22_DATA) \
- $(hicolor_icon32_DATA) \
- $(hicolor_icon48_DATA) \
- $(hicolor_icon256_DATA) \
- $(hicolor_iconsymbolic_DATA) \
- icons/hicolor/gnome-music.svg
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk hicolor icon cache."; \
- $(gtk_update_hicolor_icon_cache); \
- else \
- echo "*** Icon cache not updated. After (un)install, run this:"; \
- echo "*** $(gtk_update_hicolor_icon_cache)"; \
- fi
-
-
-gsettings_SCHEMAS = org.gnome.Music.gschema.xml
-
-# For uninstalled use
-gschemas.compiled: $(gsettings_SCHEMAS) Makefile
- $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) $(builddir)
-
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
- $(hicolor_icon_files) \
- $(resource_files) \
- org.gnome.Music.appdata.xml.in \
- org.gnome.Music.desktop.in \
- gnome-music.gresource.xml \
- org.gnome.Music.gschema.xml \
- $(man1_MANS) \
- $(NULL)
-
-CLEANFILES = \
- gnome-music.gresource \
- org.gnome.Music.appdata.xml \
- $(apps_DATA) \
- *.valid \
- gschemas.compiled \
- $(NULL)
-
-all-local: gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/hicolor/16x16/apps/gnome-music.png b/data/icons/hicolor/16x16/apps/org.gnome.Music.png
index 23056cc4..23056cc4 100644
--- a/data/icons/hicolor/16x16/apps/gnome-music.png
+++ b/data/icons/hicolor/16x16/apps/org.gnome.Music.png
Binary files differ
diff --git a/data/icons/hicolor/22x22/apps/gnome-music.png b/data/icons/hicolor/22x22/apps/org.gnome.Music.png
index 91ddd106..91ddd106 100644
--- a/data/icons/hicolor/22x22/apps/gnome-music.png
+++ b/data/icons/hicolor/22x22/apps/org.gnome.Music.png
Binary files differ
diff --git a/data/icons/hicolor/256x256/apps/gnome-music.png b/data/icons/hicolor/256x256/apps/org.gnome.Music.png
index e66ecb3c..e66ecb3c 100644
--- a/data/icons/hicolor/256x256/apps/gnome-music.png
+++ b/data/icons/hicolor/256x256/apps/org.gnome.Music.png
Binary files differ
diff --git a/data/icons/hicolor/32x32/apps/gnome-music.png b/data/icons/hicolor/32x32/apps/org.gnome.Music.png
index 580266fe..580266fe 100644
--- a/data/icons/hicolor/32x32/apps/gnome-music.png
+++ b/data/icons/hicolor/32x32/apps/org.gnome.Music.png
Binary files differ
diff --git a/data/icons/hicolor/48x48/apps/gnome-music.png b/data/icons/hicolor/48x48/apps/org.gnome.Music.png
index 06f91cc2..06f91cc2 100644
--- a/data/icons/hicolor/48x48/apps/gnome-music.png
+++ b/data/icons/hicolor/48x48/apps/org.gnome.Music.png
Binary files differ
diff --git a/data/icons/hicolor/gnome-music.blend b/data/icons/hicolor/org.gnome.Music.blend
index 500aab38..500aab38 100644
--- a/data/icons/hicolor/gnome-music.blend
+++ b/data/icons/hicolor/org.gnome.Music.blend
Binary files differ
diff --git a/data/icons/hicolor/gnome-music.svg b/data/icons/hicolor/org.gnome.Music.svg
index c6a779c3..c6a779c3 100644
--- a/data/icons/hicolor/gnome-music.svg
+++ b/data/icons/hicolor/org.gnome.Music.svg
diff --git a/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
index 95db22b2..95db22b2 100644
--- a/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 00000000..a74290af
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,79 @@
+# Compiling the resources
+about_dialog_conf = configuration_data()
+about_dialog_conf.set('PACKAGE_VERSION', meson.project_version())
+about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
+
+gnome.compile_resources(
+ PROJECT_RDNN_NAME,
+ PROJECT_RDNN_NAME + '.gresource.xml',
+ gresource_bundle: true,
+ source_dir: '.',
+ install_dir: PKGDATA_DIR,
+ install: true,
+ dependencies: configure_file(
+ input: 'AboutDialog.ui.in',
+ output: 'AboutDialog.ui',
+ configuration: about_dialog_conf
+ )
+)
+
+# Installing the schema file
+install_data(
+ PROJECT_RDNN_NAME + '.gschema.xml',
+ install_dir: 'share/glib-2.0/schemas'
+)
+
+# Merging the translations with the desktop file
+i18n.merge_file(
+ output: PROJECT_RDNN_NAME + '.desktop',
+ input: PROJECT_RDNN_NAME + '.desktop.in',
+ po_dir: join_paths(meson.source_root(), 'po'),
+ type: 'desktop',
+ install: true,
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'applications')
+)
+
+# Validating the desktop file
+desktop_file_validate = find_program('desktop-file-validate', required:false)
+if desktop_file_validate.found()
+ test (
+ 'Validate desktop file',
+ desktop_file_validate,
+ args: join_paths(meson.current_build_dir (), PROJECT_RDNN_NAME + '.desktop')
+ )
+endif
+
+# Merging the translations with the appdata file
+i18n.merge_file(
+ output: PROJECT_RDNN_NAME + '.appdata.xml',
+ input: PROJECT_RDNN_NAME + '.appdata.xml.in',
+ po_dir: join_paths(meson.source_root(), 'po'),
+ install: true,
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
+)
+
+# Validating the appdata file
+appstreamcli = find_program(['appstreamcli', 'appstream-util'], required: false)
+if appstreamcli.found()
+ test (
+ 'Validate appdata file',
+ appstreamcli,
+ args: ['validate', join_paths(meson.current_build_dir (), PROJECT_RDNN_NAME + '.appdata.xml')]
+ )
+endif
+
+# Installing the icons
+icon_sizes = ['16', '22', '32', '48', '256']
+
+foreach i : icon_sizes
+ install_data(
+ join_paths('icons/hicolor', i + 'x' + i, 'apps', PROJECT_RDNN_NAME + '.png'),
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
+ )
+endforeach
+
+# Installing the symbolic icon
+install_data(
+ join_paths('icons/hicolor/symbolic/apps', PROJECT_RDNN_NAME + '-symbolic.svg'),
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps')
+) \ No newline at end of file
diff --git a/data/org.gnome.Music.appdata.xml.in b/data/org.gnome.Music.appdata.xml.in
index 031c4361..88c198f5 100644
--- a/data/org.gnome.Music.appdata.xml.in
+++ b/data/org.gnome.Music.appdata.xml.in
@@ -38,5 +38,5 @@
</kudos>
<update_contact>mschraal@gnome.org</update_contact>
- <translation type="gettext">gnome-music</translation>
+ <translation type="gettext">org.gnome.Music</translation>
</component>
diff --git a/data/org.gnome.Music.desktop.in b/data/org.gnome.Music.desktop.in
index 013cba67..7dfc4e78 100644
--- a/data/org.gnome.Music.desktop.in
+++ b/data/org.gnome.Music.desktop.in
@@ -3,7 +3,7 @@ Name=Music
GenericName=Music Player
Comment=Play and organize your music collection
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-music
+Icon=org.gnome.Music
Exec=gnome-music
Terminal=false
Type=Application
diff --git a/data/gnome-music.gresource.xml b/data/org.gnome.Music.gresource.xml
index d98bb47d..d98bb47d 100644
--- a/data/gnome-music.gresource.xml
+++ b/data/org.gnome.Music.gresource.xml
diff --git a/data/org.gnome.Music.gschema.xml b/data/org.gnome.Music.gschema.xml
index 7ccefe1f..467d1d53 100644
--- a/data/org.gnome.Music.gschema.xml
+++ b/data/org.gnome.Music.gschema.xml
@@ -6,7 +6,7 @@
<value nick="all" value="2"/>
<value nick="shuffle" value="3"/>
</enum>
- <schema path="/org/gnome/Music/" id="org.gnome.Music" gettext-domain="gnome-music">
+ <schema path="/org/gnome/Music/" id="org.gnome.Music" gettext-domain="org.gnome.Music">
<key type="ai" name="window-size">
<default>[768, 600]</default>
<summary>Window size</summary>
diff --git a/gnome-music.in b/gnome-music.in
index a62d35f7..6a379bdf 100644..100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (c) 2016 The GNOME Music Developers
+# Copyright © 2018 The GNOME Music Developers
#
# GNOME Music is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -36,6 +36,12 @@ sys.path.insert(1, '@pyexecdir@')
# Make sure we'll find the gnomemusic module, even in JHBuild
sys.path.insert(1, '@pythondir@')
+_LOCAL = @local_build@
+
+# In the local use case the installed schemas go in <builddir>/data
+if _LOCAL:
+ os.environ["XDG_DATA_DIRS"] = '@schemasdir@:' + os.environ["XDG_DATA_DIRS"]
+
import gi
gi.require_version('Gtk', '3.0')
@@ -45,38 +51,20 @@ from gi.repository import GIRepository, Gio, Gtk, Gst
Gst.init(None)
-import gnomemusic
-
-
-SOURCE_DIR = os.path.abspath(
- os.path.join(os.path.dirname(gnomemusic.__file__), '..'))
-
-# Defines if we are running from inside project source. This is
-# necessary so we can set data and libgd directories correctly.
-_LOCAL = os.path.exists(os.path.join(SOURCE_DIR, 'gnome-music.doap'))
-
-# Directory settings
LOCALE_DIR = '@localedir@'
-PKGDATA_DIR = os.path.join(SOURCE_DIR, 'data') if _LOCAL else '@pkgdatadir@'
+PKGDATA_DIR = '@pkgdatadir@'
# Log settings
LOG_FORMAT = '%(asctime)s %(levelname)s\t%(message)s'
LOG_DATE_FORMAT = '%H:%M:%S'
-def set_environment_variables():
- """Sets application environment variables."""
- if _LOCAL:
- os.environ.setdefault('GSETTINGS_SCHEMA_DIR', PKGDATA_DIR)
-
-
def set_libgd():
"""Configures application to run our own libgd copy."""
+ libgd_libdir = '@pkglibdir@'
if _LOCAL:
- libgd_libdir = os.path.join(SOURCE_DIR, 'libgd', '.libs')
- libgd_typelibdir = os.path.join(SOURCE_DIR, 'libgd')
+ libgd_typelibdir = '@pkglibdir@'
else:
- libgd_libdir = '@pkglibdir@'
libgd_typelibdir = '@pkglibdir@/girepository-1.0'
GIRepository.Repository.prepend_search_path(libgd_typelibdir)
@@ -117,16 +105,16 @@ def set_log_level():
def set_internationalization():
"""Sets application internationalization."""
- locale.bindtextdomain('gnome-music', LOCALE_DIR)
- locale.textdomain('gnome-music')
- gettext.bindtextdomain('gnome-music', LOCALE_DIR)
- gettext.textdomain('gnome-music')
+ locale.bindtextdomain('@rdnn_name@', LOCALE_DIR)
+ locale.textdomain('@rdnn_name@')
+ gettext.bindtextdomain('@rdnn_name@', LOCALE_DIR)
+ gettext.textdomain('@rdnn_name@')
def set_resources():
"""Sets application ressource file."""
resource = Gio.resource_load(
- os.path.join(PKGDATA_DIR, 'gnome-music.gresource'))
+ os.path.join(PKGDATA_DIR, '@rdnn_name@.gresource'))
Gio.Resource._register(resource) # nopep8
@@ -141,7 +129,6 @@ def run_application():
def main():
"""Sets environment and runs GNOME Music."""
- set_environment_variables()
set_libgd()
set_exception_hook()
set_log_level()
@@ -149,7 +136,6 @@ def main():
set_resources()
return run_application()
-
if __name__ == '__main__':
if _LOCAL:
print('Running from source tree, using local files.')
diff --git a/gnomemusic/Makefile.am b/gnomemusic/Makefile.am
deleted file mode 100644
index dff6325b..00000000
--- a/gnomemusic/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS = views widgets
-
-appdir = $(pythondir)/gnomemusic/
-
-app_PYTHON = \
- albumartcache.py \
- application.py \
- __init__.py \
- player.py \
- mpris.py \
- notification.py \
- toolbar.py \
- grilo.py \
- playlists.py\
- utils.py \
- query.py \
- scrobbler.py \
- searchbar.py \
- window.py
diff --git a/gnomemusic/views/Makefile.am b/gnomemusic/views/Makefile.am
deleted file mode 100644
index 3f9c1ca8..00000000
--- a/gnomemusic/views/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-appdir = $(pythondir)/gnomemusic/views/
-
-app_PYTHON = \
- __init__.py \
- albumsview.py \
- artistsview.py \
- baseview.py \
- emptyview.py \
- emptysearchview.py \
- initialstateview.py \
- playlistview.py \
- searchview.py \
- songsview.py
diff --git a/gnomemusic/widgets/Makefile.am b/gnomemusic/widgets/Makefile.am
deleted file mode 100644
index 69b259c0..00000000
--- a/gnomemusic/widgets/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-appdir = $(pythondir)/gnomemusic/widgets/
-
-app_PYTHON = \
- __init__.py \
- albumwidget.py \
- artistalbumswidget.py \
- artistalbumwidget.py \
- coverstack.py \
- disclistboxwidget.py \
- notificationspopup.py \
- playlistdialog.py \
- starhandlerwidget.py
diff --git a/help/LINGUAS b/help/LINGUAS
new file mode 100644
index 00000000..c228c5db
--- /dev/null
+++ b/help/LINGUAS
@@ -0,0 +1,14 @@
+ca
+cs
+da
+de
+el
+es
+fr
+gl
+hu
+ko
+pl
+pt_BR
+ro
+sv \ No newline at end of file
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 5e245456..00000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-@YELP_HELP_RULES@
-
-HELP_ID = gnome-music
-
-HELP_FILES = \
- introduction.page \
- index.page \
- play-music.page \
- playlist-create-albums.page \
- playlist-create-songs.page \
- playlist-create-artists.page \
- playlist-delete.page \
- playlist-remove-songs.page \
- playlist-repeat.page \
- playlist-shuffle.page \
- search.page \
- legal.xml
-
-HELP_MEDIA = \
- figures/gnome-music-3.12.png
-
-HELP_LINGUAS = ca cs da de el es fr gl hu ko pl pt_BR ro sv
diff --git a/help/meson.build b/help/meson.build
new file mode 100644
index 00000000..f56079e8
--- /dev/null
+++ b/help/meson.build
@@ -0,0 +1,17 @@
+gnome.yelp(meson.project_name(),
+ sources: [
+ 'introduction.page',
+ 'index.page',
+ 'play-music.page',
+ 'playlist-create-albums.page',
+ 'playlist-create-songs.page',
+ 'playlist-create-artists.page',
+ 'playlist-delete.page',
+ 'playlist-remove-songs.page',
+ 'playlist-repeat.page',
+ 'playlist-shuffle.page',
+ 'search.page',
+ 'legal.xml'
+ ],
+ media: 'figures/gnome-music-3.12.png'
+) \ No newline at end of file
diff --git a/meson.build b/meson.build
new file mode 100644
index 00000000..9fa28fb9
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,93 @@
+project('gnome-music',
+ version: '3.27.90'
+)
+
+# Importing modules
+gnome = import('gnome')
+i18n = import('i18n')
+python = import('python3')
+
+# Make sure Python is installed and found
+if not python.find_python().found()
+ error('No valid python3 binary found')
+endif
+
+# Constants
+PACKAGE_URL = 'https://wiki.gnome.org/Apps/Music'
+PACKAGE_URL_BUG = 'https://gitlab.gnome.org/GNOME/gnome-music'
+PROJECT_RDNN_NAME='org.gnome.Music'
+
+PYTHON_DIR = join_paths(get_option('prefix'), python.sysconfig_path('purelib'))
+PKGDATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), PROJECT_RDNN_NAME)
+PKGLIB_DIR = join_paths(PKGDATA_DIR, 'libs')
+
+# Dependencies
+dependency('gobject-introspection-1.0', version: '>= 1.35.0')
+dependency('gtk+-3.0', version: '>= 3.19.3')
+dependency('libmediaart-2.0', version: '>= 1.9.1')
+dependency('tracker-sparql-2.0', version: '>= 1.99.1')
+dependency('pygobject-3.0', version: '>= 3.21.1')
+dependency('py3cairo', version: '>= 1.14.0')
+dependency('grilo-0.3', version: '>= 0.3.4')
+
+subproject('libgd',
+ default_options: [
+ 'with-introspection=true',
+ 'with-main-view=true',
+ 'with-tagged-entry=true',
+ 'with-gtk-hacks=true',
+ 'static=false',
+ 'pkgdatadir=' + PKGDATA_DIR,
+ 'pkglibdir=' + PKGLIB_DIR
+ ])
+
+subdir('data')
+subdir('help')
+subdir('po')
+
+install_subdir(
+ 'gnomemusic',
+ install_dir: PYTHON_DIR
+)
+
+# Install the executable file
+bin_config = configuration_data()
+bin_config.set('rdnn_name', PROJECT_RDNN_NAME)
+bin_config.set('pkgdatadir', PKGDATA_DIR)
+bin_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
+bin_config.set('pythondir', PYTHON_DIR)
+bin_config.set('pyexecdir', join_paths(get_option('prefix'), python.sysconfig_path('stdlib')))
+bin_config.set('schemasdir', '')
+# Used for libgd
+bin_config.set('pkglibdir', PKGLIB_DIR)
+
+bin_config.set('local_build', 'False')
+
+configure_file(
+ input: 'gnome-music.in',
+ output: 'gnome-music',
+ configuration: bin_config,
+ install_dir: get_option('bindir')
+)
+
+# Install the builddir executable
+local_config = configuration_data()
+local_config.set('rdnn_name', PROJECT_RDNN_NAME)
+local_config.set('pkgdatadir', join_paths(meson.build_root(), 'data'))
+local_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
+local_config.set('pythondir', meson.source_root())
+local_config.set('pyexecdir', meson.source_root())
+local_config.set('schemasdir', join_paths(meson.build_root(), 'data'))
+# Used for libgd
+local_config.set('pkglibdir', join_paths(meson.build_root(), 'subprojects', 'libgd', 'libgd'))
+
+local_config.set('local_build', 'True')
+
+configure_file(
+ input: 'gnome-music.in',
+ output: 'local-music',
+ configuration: local_config
+)
+
+meson.add_postconf_script('meson_post_conf.py')
+meson.add_install_script('meson_post_install.py') \ No newline at end of file
diff --git a/meson_post_conf.py b/meson_post_conf.py
new file mode 100755
index 00000000..8bf048cb
--- /dev/null
+++ b/meson_post_conf.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+build_root = os.environ.get('MESON_BUILD_ROOT')
+source_root = os.environ.get('MESON_SOURCE_ROOT')
+
+print('Install schemas in build dir...')
+subprocess.call(['glib-compile-schemas', source_root + '/data/'])
+subprocess.call(['mkdir', '-p', build_root + '/data/glib-2.0/schemas'])
+subprocess.call(['mv', source_root + '/data/gschemas.compiled', build_root + '/data/glib-2.0/schemas']) \ No newline at end of file
diff --git a/meson_post_install.py b/meson_post_install.py
new file mode 100755
index 00000000..4c3a2b72
--- /dev/null
+++ b/meson_post_install.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+prefix = os.environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+datadir = os.path.join(prefix, 'share')
+
+# Packaging tools define DESTDIR and this isn't needed for them
+if 'DESTDIR' not in os.environ:
+ print('Updating icon cache...')
+ icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
+ subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
+
+ print("Compiling the schema...")
+ schemas_dir = os.path.join(datadir, 'glib-2.0/schemas')
+ subprocess.call(['glib-compile-schemas', schemas_dir])
+
+ print('Updating desktop database...')
+ desktop_database_dir = os.path.join(datadir, 'applications')
+ subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index b1c1c516..00000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
-# package. (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.) Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright. The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = GNOME Music contributors
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty. If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-# in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-# understood.
-# - Strings which make invalid assumptions about notation of date, time or
-# money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music&keywords=I18N+L10N&component=general
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used. It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context. Possible values are "yes" and "no". Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = yes
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-# --previous to keep previous msgids of translated messages,
-# --quiet to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed. Possible values are "yes" and "no". Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist". Possible values are "yes" and
-# "no". Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 00000000..0fe4c170
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1 @@
+i18n.gettext(PROJECT_RDNN_NAME, preset:'glib') \ No newline at end of file
diff --git a/libgd b/subprojects/libgd
-Subproject 4e0f712f570716886ebb6983e6fae5411d82d30
+Subproject 4e0f712f570716886ebb6983e6fae5411d82d30