[gnome-internet-radio-locator] GNOME Internet Radio Locator version 3.1.0



commit 2543ce5ce3abe80fd06eefee976df35f9477bcf3
Author: Ole Aamot <ole gnome org>
Date:   Sun Sep 6 01:19:15 2020 +0200

    GNOME Internet Radio Locator version 3.1.0

 NEWS                               | 20 ++++++++++++++++++++
 configure.ac                       |  2 +-
 meson.build                        | 14 ++++++++++++--
 po/meson.build                     |  6 ++++++
 src/gnome-internet-radio-locator.c |  1 +
 src/meson.build                    |  5 +++--
 6 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index ade2fb0..7aacb07 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+=============
+Version 3.1.0
+=============
+
+Build
+
+       * meson.build: Update Meson build configuration
+       * po/meson.build: Update Meson build configuration
+       * src/meson.build: Update Meson build configuration
+
+GUI
+
+       * src/gnome-internet-radio-locator.c: Add config.h
+
+Translations
+
+       * Rafael Fontenelle (pt_BR)
+       * Yuri Chornoivan (uk)
+       * Piotr Drąg (pl)
+
 =============
 Version 3.0.5
 =============
diff --git a/configure.ac b/configure.ac
index 5a88bcb..73d2a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(gnome-internet-radio-locator,3.0.5)
+AC_INIT(gnome-internet-radio-locator,3.1.0)
 AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/gnome-internet-radio-locator.c])
diff --git a/meson.build b/meson.build
index 0d93276..0a2abeb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,22 +1,32 @@
 project('gnome-internet-radio-locator', 'c',
-  version : '2.0.0',
+  version : '3.1.0',
   meson_version: '>= 0.49.2',
   license : 'GPL')
+prefix = get_option('prefix')
+localedir = join_paths(prefix, get_option('localedir'))
+arguments = join_paths('-DGNOME_INTERNET_RADIO_LOCATOR_LOCALEDIR=', localedir)
 add_project_arguments('-DDEBUG=0', language : 'c')
+add_project_arguments('-DGETTEXT_PACKAGE="gnome-internet-radio-locator"', language:'c')
+add_project_arguments(arguments, language:'c')
 glib_dep = dependency('glib-2.0')
 gtk3_dep = dependency('gtk+-3.0')
 gst_dep = dependency('gstreamer-player-1.0')
 champlain_gtk_dep = dependency('champlain-gtk-0.12')
 champlain_dep = dependency('champlain-0.12')
 geocode_dep = dependency('geocode-glib-1.0')
+geoclue_dep = dependency('libgeoclue-2.0')
 libxml_dep = dependency('libxml-2.0')
 cc = meson.get_compiler('c')
+config_h = configuration_data()
+config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+config_h.set_quoted('GNOME_INTERNET_RADIO_LOCATOR_LOCALEDIR', localedir)
+configure_file(output: 'config.h', configuration: config_h)
 m_dep = cc.find_library('m', required : false)
 inc = include_directories('src')
 subdir('src')
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : gnomeinternetradiolibrary,
-                 version : '1.9.0',
+                 version : '3.1.0',
                  name : 'libgnomeinternetradiolibrary',
                  filebase : 'gnomeinternetradiolibrary',
                  description : 'GNOME Internet Radio Library')
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..762ed35
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,6 @@
+i18n = import('i18n')
+# define GETTEXT_PACKAGE
+add_project_arguments('-DGETTEXT_PACKAGE="gnome-internet-radio-locator"', language:'c')
+i18n.gettext(meson.project_name(),
+    args: '--directory=' + meson.source_root()
+)
\ No newline at end of file
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index f2b8b04..4fc396e 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gtk/gtk.h>
 #include <gst/player/player.h>
 #include <champlain/champlain.h>
diff --git a/src/meson.build b/src/meson.build
index 387ee21..8e0dd46 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,9 +6,10 @@ as_micro_version = ver_arr[2]
 conf = configuration_data()
 conf.set_quoted('VERSION', as_version)
 conf.set_quoted('GNOME_INTERNET_RADIO_LOCATOR_DATADIR', join_paths(join_paths(get_option('prefix'), 
get_option('datadir')), meson.project_name()))
+conf.set_quoted('GNOME_INTERNET_RADIO_LOCATOR_LOCALEDIR', join_paths(join_paths(get_option('prefix'), 
get_option('localedir')), meson.project_name()))
 configure_file(output : 'config.h', configuration : conf)
 gnomeinternetradio_sources = ['gnome-internet-radio-locator.c', 'gnome-internet-radio-locator-gui.c', 
'gnome-internet-radio-locator-listener.c', 'gnome-internet-radio-locator-markers.c', 
'gnome-internet-radio-locator-player.c', 'gnome-internet-radio-locator-program.c', 
'gnome-internet-radio-locator-radius.c', 'gnome-internet-radio-locator-runners.c', 
'gnome-internet-radio-locator-station.c', 'gnome-internet-radio-locator-stations-map.c', 
'gnome-internet-radio-locator-streams.c', 'gnome-internet-radio-locator-tz.c', 
'gnome-internet-radio-locator.h', 'gnome-internet-radio-locator-gui.h', 
'gnome-internet-radio-locator-listener.h', 'gnome-internet-radio-locator-markers.h', 
'gnome-internet-radio-locator-player.h', 'gnome-internet-radio-locator-program.h', 
'gnome-internet-radio-locator-radius.h', 'gnome-internet-radio-locator-runners.h', 
'gnome-internet-radio-locator-station.h', 'gnome-internet-radio-locator-stations-map.h', 
'gnome-internet-radio-locator-streams.h', 'gnome-internet-radio-
 locator-tz.h' ]
-gnomeinternetradiolibrary = shared_library('gnomeinternetradiolibrary', gnomeinternetradio_sources, 
dependencies : [glib_dep, gtk3_dep, gst_dep, champlain_gtk_dep, champlain_dep, geocode_dep, libxml_dep, 
m_dep], install : true)
+gnomeinternetradiolibrary = shared_library('gnomeinternetradiolibrary', gnomeinternetradio_sources, 
dependencies : [glib_dep, gtk3_dep, gst_dep, champlain_gtk_dep, champlain_dep, geocode_dep, geoclue_dep, 
libxml_dep, m_dep], install : true)
 install_data(
     meson.project_name() + '.xml',
     install_dir: join_paths(get_option('datadir'), 'gnome-internet-radio-locator')
@@ -20,4 +21,4 @@ gnomeinternetradio_resources = gnome.compile_resources(
   source_dir: '.'
 )
 gnomeinternetradiolocator_schemas = gnome.compile_schemas()
-gnomeinternetradiolocator = executable('gnome-internet-radio-locator', gnomeinternetradio_sources, 
gnomeinternetradio_resources, dependencies: [glib_dep, gtk3_dep, gst_dep, champlain_gtk_dep, champlain_dep, 
geocode_dep, libxml_dep, m_dep], link_with: gnomeinternetradiolibrary, install: true)
+gnomeinternetradiolocator = executable('gnome-internet-radio-locator', gnomeinternetradio_sources, 
gnomeinternetradio_resources, dependencies: [glib_dep, gtk3_dep, gst_dep, champlain_gtk_dep, champlain_dep, 
geocode_dep, geoclue_dep, libxml_dep, m_dep], link_with: gnomeinternetradiolibrary, install: true)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]