Hello community,
here is the log from the commit of package gnome-internet-radio-locator for
openSUSE:Factory checked in at 2018-06-02 12:09:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-internet-radio-locator (Old)
and /work/SRC/openSUSE:Factory/.gnome-internet-radio-locator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-internet-radio-locator"
Sat Jun 2 12:09:50 2018 rev:2 rq:613061 version:1.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-internet-radio-locator/gnome-internet-radio-locator.changes
2018-05-29 16:52:47.586674363 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-internet-radio-locator.new/gnome-internet-radio-locator.changes
2018-06-02 12:09:57.392813120 +0200
@@ -1,0 +2,10 @@
+Tue May 29 18:09:26 UTC 2018 - bjorn....@gmail.com
+
+- Update to version 1.4.0:
+ + Add various radio stations.
+- Changes from version 1.3.0:
+ + Add various radio stations.
+- Drop girl-add-missing-return.patch: No longer needed, fixed in a
+ different way upstream.
+
+-------------------------------------------------------------------
Old:
----
girl-add-missing-return.patch
gnome-internet-radio-locator-1.2.0.tar.xz
New:
----
gnome-internet-radio-locator-1.4.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-internet-radio-locator.spec ++++++
--- /var/tmp/diff_new_pack.eC4Ft8/_old 2018-06-02 12:09:58.788761921 +0200
+++ /var/tmp/diff_new_pack.eC4Ft8/_new 2018-06-02 12:09:58.792761774 +0200
@@ -17,15 +17,13 @@
Name: gnome-internet-radio-locator
-Version: 1.2.0
+Version: 1.4.0
Release: 0
Summary: Live Internet radio broadcaster discovery program
License: GPL-3.0-or-later
Group: Productivity/Multimedia/Sound/Utilities
URL: https://wiki.gnome.org/Apps/InternetRadioLocator
-Source0:
https://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM girl-add-missing-return.patch bjorn....@gmail.com -- Add
missing return statement
-Patch0: girl-add-missing-return.patch
+Source0:
https://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz
BuildRequires: intltool
BuildRequires: itstool
++++++ gnome-internet-radio-locator-1.2.0.tar.xz ->
gnome-internet-radio-locator-1.4.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/ChangeLog
new/gnome-internet-radio-locator-1.4.0/ChangeLog
--- old/gnome-internet-radio-locator-1.2.0/ChangeLog 2018-05-19
17:10:14.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/ChangeLog 2018-05-26
18:13:13.000000000 +0200
@@ -1,3 +1,58 @@
+commit ed475ecda310c56539eceed5f99121949f7a2160
+Author: Ole Aamot <o...@gnome.org>
+Date: Sat May 26 18:00:11 2018 +0200
+
+ gnome-internet-radio-locator version 1.4.0
+
+ NEWS | 15 +++++++++++++++
+ configure.ac | 2 +-
+ src/Makefile.am | 3 +--
+ src/gnome-internet-radio-locator.c | 3 +--
+ src/gnome-internet-radio-locator.xml | 29 +++++++++++++++++++++++++++--
+ 5 files changed, 45 insertions(+), 7 deletions(-)
+
+commit 08049592c2bb40f71f7322c529f1914bcca0412e
+Author: Ole Aamot <o...@gnome.org>
+Date: Tue May 22 01:47:27 2018 +0200
+
+ Describe map marker playback functionality
+
+ README | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 049d74317c3f6991432f438ad1b170295c2ca94e
+Author: Ole Aamot <o...@gnome.org>
+Date: Sun May 20 23:23:12 2018 +0200
+
+ gnome-internet-radio-locator version 1.3.0
+
+ NEWS | 13 ++++++
+ README | 2 +-
+ configure.ac | 2 +-
+ gnome-internet-radio-locator.spec.in | 5 ++-
+ src/gnome-internet-radio-locator-markers.c | 68 ++++++++++++++++++++++++++++++
+ src/gnome-internet-radio-locator.c | 4 +-
+ src/gnome-internet-radio-locator.xml | 2 +-
+ 7 files changed, 90 insertions(+), 6 deletions(-)
+
+commit c2cc84983ba7576e6e7fd9f761af1b9edb0c634d
+Author: Ole Aamot <o...@gnome.org>
+Date: Sun May 20 15:30:07 2018 +0200
+
+ gnome-internet-radio-locator version 1.2.0
+
+ src/gnome-internet-radio-locator.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e8d66946839c5340d762a9649ebadeca0dc79ac6
+Author: Ole Aamot <o...@gnome.org>
+Date: Sat May 19 17:18:57 2018 +0200
+
+ Build on Fedora 28
+
+ gnome-internet-radio-locator.spec.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
commit b956c0b27a23fa37521c3729c9065caa6b843bc4
Author: Ole Aamot <o...@gnome.org>
Date: Sat May 19 17:07:48 2018 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/Makefile
new/gnome-internet-radio-locator-1.4.0/Makefile
--- old/gnome-internet-radio-locator-1.2.0/Makefile 2018-05-19
17:10:10.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/Makefile 2018-05-26
18:51:40.000000000 +0200
@@ -208,15 +208,15 @@
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/ole/Software/gnome-internet-radio-locator/missing
aclocal-1.15
+ACLOCAL = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/missing
aclocal-1.15
ALL_LINGUAS =
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AR = ar
AS = as
-AUTOCONF = ${SHELL} /home/ole/Software/gnome-internet-radio-locator/missing
autoconf
-AUTOHEADER = ${SHELL} /home/ole/Software/gnome-internet-radio-locator/missing
autoheader
-AUTOMAKE = ${SHELL} /home/ole/Software/gnome-internet-radio-locator/missing
automake-1.15
+AUTOCONF = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/missing
autoconf
+AUTOHEADER = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/missing
autoheader
+AUTOMAKE = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/missing
automake-1.15
AWK = gawk
CATALOGS =
CATOBJEXT = .gmo
@@ -235,21 +235,21 @@
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
ENABLE_USER_HELP =
EXEEXT =
-FGREP = /bin/grep -F
+FGREP = /usr/bin/grep -F
GETTEXT_PACKAGE = gnome-internet-radio-locator
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
-GNOME_INTERNET_RADIO_LOCATOR_CFLAGS = -pthread
-I/usr/include/libchamplain-gtk-0.12 -I/usr/include/clutter-gtk-1.0
-I/usr/include/libchamplain-0.12 -I/usr/include/libsoup-2.4
-I/usr/include/clutter-1.0 -I/usr/include/cogl -I/usr/include/libdrm
-I/usr/include/json-glib-1.0 -I/usr/include/geocode-glib-1.0
-I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4
-I/usr/include/gstreamer-1.0 -I/usr/include/gtk-3.0
-I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0
-I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include
-I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo
-I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo
-I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16
-I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz
-I/usr/include/pango-1.0 -I/usr/include/glib-2.0
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2
-I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16
-GNOME_INTERNET_RADIO_LOCATOR_LIBS = -lchamplain-gtk-0.12 -lclutter-gtk-1.0
-lchamplain-0.12 -lclutter-1.0 -lcogl-path -lcogl-pango -lcogl -lgmodule-2.0
-pthread -lwayland-egl -lgbm -ldrm -lEGL -lXrandr -ljson-glib-1.0
-lwayland-cursor -lwayland-client -lxkbcommon -lwayland-server -lX11 -lXext
-lXdamage -lXfixes -lXcomposite -lXi -lgeocode-glib -lgstplayer-1.0
-lgsttag-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgtk-3 -lgdk-3
-lpangocairo-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0
-lxml2 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig
-lfreetype
+GNOME_INTERNET_RADIO_LOCATOR_CFLAGS = -I/usr/include/libchamplain-gtk-0.12
-I/usr/include/clutter-gtk-1.0 -I/usr/include/clutter-1.0 -I/usr/include/cogl
-I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16
-I/usr/include/uuid -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm
-I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi
-I/usr/include/harfbuzz -I/usr/include/json-glib-1.0 -I/usr/include/gtk-3.0
-I/usr/include/gio-unix-2.0/ -I/usr/include/at-spi2-atk/2.0
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include
-I/usr/include/libchamplain-0.12 -I/usr/include/libsoup-2.4
-I/usr/include/libxml2 -I/usr/include/geocode-glib-1.0
-I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -pthread
+GNOME_INTERNET_RADIO_LOCATOR_LIBS = -lchamplain-gtk-0.12 -lclutter-gtk-1.0
-lglib-2.0 -lglib-2.0 -lglib-2.0 -lglib-2.0 -lglib-2.0 -lchamplain-0.12
-lclutter-1.0 -lglib-2.0 -lcogl-path -lglib-2.0 -lglib-2.0 -lcogl-pango
-lglib-2.0 -lcogl -lgmodule-2.0 -pthread -lglib-2.0 -lwayland-egl -lgbm -ldrm
-lEGL -lXrandr -ljson-glib-1.0 -lwayland-cursor -lwayland-client -lxkbcommon
-lwayland-server -lX11 -lXext -lXdamage -lXfixes -lXcomposite -lXi
-lgeocode-glib -lgstplayer-1.0 -lgsttag-1.0 -lgstvideo-1.0 -lgstbase-1.0
-lgstreamer-1.0 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -latk-1.0 -lcairo-gobject
-lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lxml2 -lpangoft2-1.0 -lpango-1.0
-lgobject-2.0 -lglib-2.0 -lfribidi -lfontconfig -lfreetype
GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS = champlain-gtk-0.12 geocode-glib-1.0
glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-player-1.0 gstreamer-video-1.0
gtk+-3.0 libxml-2.0 pangoft2
-GREP = /bin/grep
+GREP = /usr/bin/grep
GTKDOC_CHECK = gtkdoc-check.test
GTKDOC_CHECK_PATH = /usr/bin/gtkdoc-check
-GTKDOC_DEPS_CFLAGS = -I/usr/include/glib-2.0
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-GTKDOC_DEPS_LIBS = -lgobject-2.0 -lglib-2.0
+GTKDOC_DEPS_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
+GTKDOC_DEPS_LIBS = -lgobject-2.0 -lglib-2.0
GTKDOC_MKPDF = /usr/bin/gtkdoc-mkpdf
GTKDOC_REBASE = /usr/bin/gtkdoc-rebase
HAVE_GNOME_INTERNET_RADIO_LOCATOR_RECORD =
@@ -272,7 +272,7 @@
INTLTOOL__v_MERGE_0 = @echo " ITMRG " $@;
INTL_MACOSX_LIBS =
ITSTOOL = itstool
-LD = /usr/bin/x86_64-linux-gnu-ld -m elf_x86_64
+LD = /usr/bin/ld -m elf_x86_64
LDFLAGS =
LIBM = -lm
LIBOBJS =
@@ -282,10 +282,10 @@
LN_S = ln -s
LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
-MAINT =
-MAKEINFO = ${SHELL} /home/ole/Software/gnome-internet-radio-locator/missing
makeinfo
+MAINT = #
+MAKEINFO = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/missing
makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
+MKDIR_P = /usr/bin/mkdir -p
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
MSGFMT_OPTS = -c
@@ -299,10 +299,10 @@
PACKAGE = gnome-internet-radio-locator
PACKAGE_BUGREPORT =
PACKAGE_NAME = gnome-internet-radio-locator
-PACKAGE_STRING = gnome-internet-radio-locator 1.2.0
+PACKAGE_STRING = gnome-internet-radio-locator 1.4.0
PACKAGE_TARNAME = gnome-internet-radio-locator
PACKAGE_URL =
-PACKAGE_VERSION = 1.2.0
+PACKAGE_VERSION = 1.4.0
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -312,20 +312,20 @@
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
RANLIB = ranlib
-SED = /bin/sed
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
STRIP = strip
USE_NLS = yes
-VERSION = 1.2.0
+VERSION = 1.4.0
XGETTEXT = /usr/bin/xgettext
XMLLINT = xmllint
YELP_LC_DIST = true
YELP_LC_MEDIA_LINKS = true
-abs_builddir = /home/ole/Software/gnome-internet-radio-locator
-abs_srcdir = /home/ole/Software/gnome-internet-radio-locator
-abs_top_builddir = /home/ole/Software/gnome-internet-radio-locator
-abs_top_srcdir = /home/ole/Software/gnome-internet-radio-locator
+abs_builddir =
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0
+abs_srcdir = /home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0
+abs_top_builddir =
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0
+abs_top_srcdir =
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_DUMPBIN =
@@ -354,7 +354,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL}
/home/ole/Software/gnome-internet-radio-locator/install-sh
+install_sh = ${SHELL}
/home/oleaamot/rpmbuild/SOURCES/gnome-internet-radio-locator-1.4.0/install-sh
intltool__v_merge_options_ =
$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
intltool__v_merge_options_0 = -q
libdir = ${exec_prefix}/lib
@@ -416,7 +416,7 @@
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -442,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: # $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
@@ -455,7 +455,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+$(srcdir)/config.h.in: # $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/NEWS
new/gnome-internet-radio-locator-1.4.0/NEWS
--- old/gnome-internet-radio-locator-1.2.0/NEWS 2018-05-19 17:05:16.000000000
+0200
+++ new/gnome-internet-radio-locator-1.4.0/NEWS 2018-05-26 18:12:50.000000000
+0200
@@ -1,4 +1,32 @@
=============
+Version 1.4.0
+=============
+
+GUI
+
+ * src/gnome-internet-radio-locator.c: Eiffel Tower
+
+Stations
+
+ * src/gnome-internet-radio-locator.xml: Add France Culture (Paris)
+ * src/gnome-internet-radio-locator.xml: Add France Info (Paris)
+ * src/gnome-internet-radio-locator.xml: Add France Inter (Paris)
+ * src/gnome-internet-radio-locator.xml: Add Radio Revolt streams
+
+=============
+Version 1.3.0
+=============
+
+GUI
+
+ * src/gnome-internet-radio-locator-markers.c: Calgary, Canada
+ * src/gnome-internet-radio-locator-markers.c: Kingston, Canada
+ * src/gnome-internet-radio-locator-markers.c: Ottawa, Canada
+ * src/gnome-internet-radio-locator-markers.c: Sydney, Canada
+ * src/gnome-internet-radio-locator-markers.c: Toronto, Canada
+ * src/gnome-internet-radio-locator-markers.c: Waterloo, Canada
+
+=============
Version 1.2.0
=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/README
new/gnome-internet-radio-locator-1.4.0/README
--- old/gnome-internet-radio-locator-1.2.0/README 2018-03-28
17:29:51.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/README 2018-05-22
01:47:09.000000000 +0200
@@ -11,7 +11,8 @@
You can view all the stations in src/gnome-internet-radio-locator.xml
and enter city names in the GUI search input field in order to locate
-radio stations in the city using the text search with auto-completion.
+radio stations in the city using the text search with auto-completion
+or click on one of the city marker in the map to listen to a station.
To launch the program, you can click on Activities in GNOME 3 and enter
@@ -26,7 +27,7 @@
You can download pre-compiled binaries for Debian GNU/Linux i386,
Fedora Core x86_64 and Ubuntu Linux amd64 from the web site at
- https://people.gnome.org/~ole/gnome-internet-radio-locator/
+ https://www.gnome.org/~ole/gnome-internet-radio-locator/
You can download the latest release from the official GNOME site:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/configure
new/gnome-internet-radio-locator-1.4.0/configure
--- old/gnome-internet-radio-locator-1.2.0/configure 2018-05-19
17:10:05.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/configure 2018-05-26
18:13:04.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-internet-radio-locator 1.2.0.
+# Generated by GNU Autoconf 2.69 for gnome-internet-radio-locator 1.4.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-internet-radio-locator'
PACKAGE_TARNAME='gnome-internet-radio-locator'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='gnome-internet-radio-locator 1.2.0'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='gnome-internet-radio-locator 1.4.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1431,7 +1431,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnome-internet-radio-locator 1.2.0 to adapt to many
kinds of systems.
+\`configure' configures gnome-internet-radio-locator 1.4.0 to adapt to many
kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1503,7 +1503,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-internet-radio-locator
1.2.0:";;
+ short | recursive ) echo "Configuration of gnome-internet-radio-locator
1.4.0:";;
esac
cat <<\_ACEOF
@@ -1642,7 +1642,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-internet-radio-locator configure 1.2.0
+gnome-internet-radio-locator configure 1.4.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2007,7 +2007,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-internet-radio-locator $as_me 1.2.0, which was
+It was created by gnome-internet-radio-locator $as_me 1.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2870,7 +2870,7 @@
# Define the identity of the package.
PACKAGE='gnome-internet-radio-locator'
- VERSION='1.2.0'
+ VERSION='1.4.0'
cat >>confdefs.h <<_ACEOF
@@ -17799,7 +17799,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-internet-radio-locator $as_me 1.2.0, which was
+This file was extended by gnome-internet-radio-locator $as_me 1.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17865,7 +17865,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-internet-radio-locator config.status 1.2.0
+gnome-internet-radio-locator config.status 1.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/configure.ac
new/gnome-internet-radio-locator-1.4.0/configure.ac
--- old/gnome-internet-radio-locator-1.2.0/configure.ac 2018-05-19
17:02:01.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/configure.ac 2018-05-26
18:12:50.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(gnome-internet-radio-locator,1.2.0)
+AC_INIT(gnome-internet-radio-locator,1.4.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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/gnome-internet-radio-locator.spec.in
new/gnome-internet-radio-locator-1.4.0/gnome-internet-radio-locator.spec.in
--- old/gnome-internet-radio-locator-1.2.0/gnome-internet-radio-locator.spec.in
2018-05-04 17:16:55.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/gnome-internet-radio-locator.spec.in
2018-05-20 23:17:15.000000000 +0200
@@ -3,7 +3,7 @@
Release: 1%{?dist}
Summary: GNOME Internet Radio Locator for GNOME 3
License: GPLv3+
-URL: https://people.gnome.org/~ole/%{name}
+URL: https://www.gnome.org/~ole/%{name}
Source: %{url}/%{name}-%{version}.tar.xz
BuildRequires: gtk3-devel
@@ -58,6 +58,12 @@
%{_mandir}/man1/%{name}.1*
%changelog
+* Sun May 20 2018 Ole Aamot <o...@gnome.org> - 1.3.0-0
+- gnome-internet-radio-locator 1.3.0 build on Fedora Linux 28
+
+* Sat May 19 2018 Ole Aamot <o...@gnome.org> - 1.2.0-0
+- gnome-internet-radio-locator 1.2.0 build on Fedora Linux 28
+
* Fri Apr 27 2018 Ole Aamot <o...@gnome.org> - 1.1.3-1
- gnome-internet-radio-locator 1.1.3 build on Fedora Linux 28
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/src/Makefile.am
new/gnome-internet-radio-locator-1.4.0/src/Makefile.am
--- old/gnome-internet-radio-locator-1.2.0/src/Makefile.am 2018-04-19
16:21:05.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/src/Makefile.am 2018-05-26
18:12:50.000000000 +0200
@@ -14,7 +14,6 @@
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 \
@@ -35,7 +34,7 @@
gnomeinternetradiolocator_DATA = gnome-internet-radio-locator-0.1.dtd
gnome-internet-radio-locator.xml
-EXTRA_DIST = gnome-internet-radio-locator.h
gnome-internet-radio-locator-player.h gnome-internet-radio-locator-keys.h
gnome-internet-radio-locator-markers.h gnome-internet-radio-locator-player-kb.h
gnome-internet-radio-locator-player-resource.h
gnome-internet-radio-locator-station.h
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-radius.h
gnome-internet-radio-locator-runners.h gnome-internet-radio-locator-streams.h
gnome-internet-radio-locator-0.1.dtd gnome-internet-radio-locator.xml
gnome-internet-radio-locator.xsl
+EXTRA_DIST = gnome-internet-radio-locator.h
gnome-internet-radio-locator-player.h gnome-internet-radio-locator-keys.h
gnome-internet-radio-locator-markers.h gnome-internet-radio-locator-player-kb.h
gnome-internet-radio-locator-player-resource.h
gnome-internet-radio-locator-station.h
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-runners.h
gnome-internet-radio-locator-streams.h gnome-internet-radio-locator-0.1.dtd
gnome-internet-radio-locator.xml gnome-internet-radio-locator.xsl
LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-internet-radio-locator-1.2.0/src/Makefile.in
new/gnome-internet-radio-locator-1.4.0/src/Makefile.in
--- old/gnome-internet-radio-locator-1.2.0/src/Makefile.in 2018-05-19
17:10:06.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/src/Makefile.in 2018-05-26
18:13:05.000000000 +0200
@@ -113,7 +113,6 @@
gnome_internet_radio_locator-gnome-internet-radio-locator-markers.$(OBJEXT) \
gnome_internet_radio_locator-gnome-internet-radio-locator-player.$(OBJEXT) \
gnome_internet_radio_locator-gnome-internet-radio-locator-program.$(OBJEXT) \
-
gnome_internet_radio_locator-gnome-internet-radio-locator-radius.$(OBJEXT) \
gnome_internet_radio_locator-gnome-internet-radio-locator-runners.$(OBJEXT) \
gnome_internet_radio_locator-gnome-internet-radio-locator-station.$(OBJEXT) \
gnome_internet_radio_locator-gnome-internet-radio-locator-stations-map.$(OBJEXT)
\
@@ -404,7 +403,6 @@
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 \
@@ -422,7 +420,7 @@
gnome_internet_radio_locator_LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
gnomeinternetradiolocatordir = $(datadir)/gnome-internet-radio-locator
gnomeinternetradiolocator_DATA = gnome-internet-radio-locator-0.1.dtd
gnome-internet-radio-locator.xml
-EXTRA_DIST = gnome-internet-radio-locator.h
gnome-internet-radio-locator-player.h gnome-internet-radio-locator-keys.h
gnome-internet-radio-locator-markers.h gnome-internet-radio-locator-player-kb.h
gnome-internet-radio-locator-player-resource.h
gnome-internet-radio-locator-station.h
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-radius.h
gnome-internet-radio-locator-runners.h gnome-internet-radio-locator-streams.h
gnome-internet-radio-locator-0.1.dtd gnome-internet-radio-locator.xml
gnome-internet-radio-locator.xsl
+EXTRA_DIST = gnome-internet-radio-locator.h
gnome-internet-radio-locator-player.h gnome-internet-radio-locator-keys.h
gnome-internet-radio-locator-markers.h gnome-internet-radio-locator-player-kb.h
gnome-internet-radio-locator-player-resource.h
gnome-internet-radio-locator-station.h
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-runners.h
gnome-internet-radio-locator-streams.h gnome-internet-radio-locator-0.1.dtd
gnome-internet-radio-locator.xml gnome-internet-radio-locator.xsl
LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
noinst_HEADERS = gnome-internet-radio-locator-player-renderer.h
all: all-am
@@ -523,7 +521,6 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-markers.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-player.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-program.Po@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-runners.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-station.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-stations-map.Po@am__quote@
@@ -625,20 +622,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS)
$(CFLAGS) -c -o
gnome_internet_radio_locator-gnome-internet-radio-locator-program.obj `if test
-f 'gnome-internet-radio-locator-program.c'; then $(CYGPATH_W)
'gnome-internet-radio-locator-program.c'; else $(CYGPATH_W)
'$(srcdir)/gnome-internet-radio-locator-program.c'; fi`
-gnome_internet_radio_locator-gnome-internet-radio-locator-radius.o:
gnome-internet-radio-locator-radius.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS) $(CFLAGS) -MT
gnome_internet_radio_locator-gnome-internet-radio-locator-radius.o -MD -MP -MF
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Tpo
-c -o gnome_internet_radio_locator-gnome-internet-radio-locator-radius.o `test
-f 'gnome-internet-radio-locator-radius.c' || echo
'$(srcdir)/'`gnome-internet-radio-locator-radius.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Tpo
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='gnome-internet-radio-locator-radius.c'
object='gnome_internet_radio_locator-gnome-internet-radio-locator-radius.o'
libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS)
$(CFLAGS) -c -o
gnome_internet_radio_locator-gnome-internet-radio-locator-radius.o `test -f
'gnome-internet-radio-locator-radius.c' || echo
'$(srcdir)/'`gnome-internet-radio-locator-radius.c
-
-gnome_internet_radio_locator-gnome-internet-radio-locator-radius.obj:
gnome-internet-radio-locator-radius.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS) $(CFLAGS) -MT
gnome_internet_radio_locator-gnome-internet-radio-locator-radius.obj -MD -MP
-MF
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Tpo
-c -o gnome_internet_radio_locator-gnome-internet-radio-locator-radius.obj `if
test -f 'gnome-internet-radio-locator-radius.c'; then $(CYGPATH_W)
'gnome-internet-radio-locator-radius.c'; else $(CYGPATH_W)
'$(srcdir)/gnome-internet-radio-locator-radius.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Tpo
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-radius.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='gnome-internet-radio-locator-radius.c'
object='gnome_internet_radio_locator-gnome-internet-radio-locator-radius.obj'
libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS)
$(CFLAGS) -c -o
gnome_internet_radio_locator-gnome-internet-radio-locator-radius.obj `if test
-f 'gnome-internet-radio-locator-radius.c'; then $(CYGPATH_W)
'gnome-internet-radio-locator-radius.c'; else $(CYGPATH_W)
'$(srcdir)/gnome-internet-radio-locator-radius.c'; fi`
-
gnome_internet_radio_locator-gnome-internet-radio-locator-runners.o:
gnome-internet-radio-locator-runners.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_internet_radio_locator_CFLAGS) $(CFLAGS) -MT
gnome_internet_radio_locator-gnome-internet-radio-locator-runners.o -MD -MP -MF
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-runners.Tpo
-c -o gnome_internet_radio_locator-gnome-internet-radio-locator-runners.o `test
-f 'gnome-internet-radio-locator-runners.c' || echo
'$(srcdir)/'`gnome-internet-radio-locator-runners.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-runners.Tpo
$(DEPDIR)/gnome_internet_radio_locator-gnome-internet-radio-locator-runners.Po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-markers.c
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-markers.c
---
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-markers.c
2018-05-19 16:57:37.000000000 +0200
+++
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-markers.c
2018-05-20 23:07:31.000000000 +0200
@@ -166,6 +166,17 @@
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Calgary, Canada\n<span size=\"small\">CJSW</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 51.0534234,
-114.0625892);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Cambridge, United Kingdom\n<span size=\"small\">Cam
FM</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -233,6 +244,18 @@
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Kingston, Canada\n<span size=\"small\">CFRC</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 44.230687,
-76.481323);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Kristiansand, Norway\n<span size=\"small\">NRK
Sørlandet</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -345,6 +368,17 @@
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Ottawa, Canada\n<span size=\"small\">CHUO</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 45.421106,
-75.690308);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Paris, France\n<span size=\"small\">Radio Campus
Paris</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -400,6 +434,29 @@
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Sydney, Canada\n<span size=\"small\">Caper
Radio</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 46.1654766,
-60.1735637935906);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Toronto, Canada\n<span size=\"small\">CIUT</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.653963,
-79.387207);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Trondheim, Norway\n<span size=\"small\">Radio
Revolt</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -420,6 +477,17 @@
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+ g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Waterloo, Canada\n<span size=\"small\">SoundFM</span>");
+ champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+ champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.466874,
-80.524635);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+ /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press",
G_CALLBACK(marker_function), station);
#if 0
marker = champlain_label_new_from_file ("icons/emblem-important.png", NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-radius.c
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-radius.c
---
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-radius.c
2018-03-26 17:18:17.000000000 +0200
+++
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-radius.c
1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-/* $id$
- *
- * GNOME Internet Radio Locator for GNOME 3
- *
- * Copyright (C) 2017, 2018 Ole Aamot Software
- *
- * Author: Ole Aamot <o...@gnome.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-#define foreach(item, array) \
- for(int keep = 1, \
- count = 0,\
- size = sizeof (array) / sizeof *(array); \
- keep && count != size; \
- keep = !keep, count++) \
- for(item = (array) + count; keep; keep = !keep)
-
-#define min(a,b) \
- ({ typedef (a) _a = (a); \
- typeof (b) _b = (b); \
- _a < _b ? _a : _b; })
-
-typedef struct _Position {
- char *url;
- float lat;
- float lon;
-} Position;
-
-int
-gnome_internet_radio_locator_radius (float latitude, float longitude, int
radius)
-{
- int values[] = {0,1,2};
- Position pos;
- float xdelta;
- float ydelta;
- float zdelta;
- char *nearest_station;
- float shortest = 1000;
- Position stations[3][3] = {{"http://www.nrk.no/",60.18526,11.08224},
- {"http://www.srib.no/",60.29230,5.22210},
-
{"http://www.nrksørlandet.no/",58.20733,8.07991}};
- foreach(int *v, values) {
- if ((stations[*v]->lat+radius >= latitude) &&
(stations[*v]->lon+radius >= longitude) && (stations[*v]->lat <=
latitude+radius) && (stations[*v]->lon <= (longitude+radius))) {
- g_print ("value: %d = %s\n", *v, stations[*v]->url);
- g_print ("value: %d = %4.2f\n", *v, stations[*v]->lat);
- g_print ("value: %d = %4.2f\n", *v, stations[*v]->lon);
- xdelta = abs(latitude-stations[*v]->lat);
- ydelta = abs(longitude-stations[*v]->lon);
- zdelta = abs(xdelta-ydelta);
- if (shortest > zdelta) {
- printf("url = %s\n", stations[*v]->url);
- nearest_station = strdup(stations[*v]->url);
- shortest = zdelta;
- }
- }
- }
- g_print ("%s\n", nearest_station);
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-radius.h
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-radius.h
---
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator-radius.h
2018-03-26 22:56:46.000000000 +0200
+++
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator-radius.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-/* $Id$
- *
- * GNOME Internet Radio Locator for GNOME 3
- *
- * Copyright (C) 2017, 2018 Ole Aamot Software
- *
- * Author: Ole Aamot <o...@gnome.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- */
-
-#ifndef GNOME_INTERNET_RADIO_LOCATOR_RADIUS_H
-#define GNOME_INTERNET_RADIO_LOCATOR_RADIUS_H
-
-int gnome_internet_radio_locator_radius (float latitude, float longitude, int
radius);
-
-#endif /* GNOME_INTERNET_RADIO_LOCATOR_RADIUS_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator.c
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator.c
--- old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator.c
2018-05-19 17:00:28.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator.c
2018-05-26 18:12:50.000000000 +0200
@@ -34,7 +34,6 @@
#include "gnome-internet-radio-locator-gui.h"
#include "gnome-internet-radio-locator-markers.h"
#include "gnome-internet-radio-locator-player.h"
-#include "gnome-internet-radio-locator-radius.h"
#define N_COLS 2
#define COL_ID 0
@@ -777,7 +776,7 @@
g_object_set (G_OBJECT (view),
"kinetic-mode", TRUE,
- "zoom-level", 4,
+ "zoom-level", 3,
NULL);
g_object_set_data (G_OBJECT (view), "window", window);
@@ -796,7 +795,7 @@
license_actor = champlain_view_get_license_actor (view);
champlain_license_set_extra_text (license_actor, "Free Internet Radio");
- champlain_view_center_on (CHAMPLAIN_VIEW (view), 51.47736225,
-0.000845336047094045);
+ champlain_view_center_on (CHAMPLAIN_VIEW (view), 48.8582602,
2.29449905431968);
layer = create_marker_layer (view, &path);
champlain_view_add_layer (view, CHAMPLAIN_LAYER (path));
champlain_view_add_layer (view, CHAMPLAIN_LAYER (layer));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator.xml
new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator.xml
--- old/gnome-internet-radio-locator-1.2.0/src/gnome-internet-radio-locator.xml
2018-05-19 16:50:18.000000000 +0200
+++ new/gnome-internet-radio-locator-1.4.0/src/gnome-internet-radio-locator.xml
2018-05-26 18:12:50.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl"
href="https://people.gnome.org/~ole/gnome-internet-radio-locator/gnome-internet-radio-locator.xsl";
?>
<!DOCTYPE gnome_internet_radio_locator SYSTEM
"gnome-internet-radio-locator-0.1.dtd">
-<gnome_internet_radio_locator version="1.1.2">
+<gnome_internet_radio_locator version="1.3.0">
<station band="ONLINE" id="drnyheder" lang="da" name="Danmarks Radio
Nyheder" rank="1.0" type="gov">
<frequency uri="http://www.dr.dk/nyheder";>FM 93.3 in Aalborg</frequency>
<location>Copenhagen, Denmark</location>
@@ -364,12 +364,13 @@
<uri>http://www.memphis.edu/wumr/</uri>
</station>
<station band="100FM" id="radiorevolt" lang="no" name="Radio Revolt"
rank="1.0" type="edu">
- <frequency uri="http://www.radiorevolt.no/";>100 FM in Trondheim,
Norway</frequency>
+ <frequency uri="https://www.radiorevolt.no/";>100 FM in Trondheim,
Norway</frequency>
<location>Trondheim, Norway</location>
<description lang="en">
Radio Revolt (formerly known as Studentradion i Trondheim), is the
student radio in Trondheim, Norway. It airs 55 hours a week on 100 and 106,2
FM, and 24 hours a day on the internet. It employs about 80 students on a
voluntary basis. The radio is a part of the Student Society in Trondheim, and
is so a part of the running of the house.
</description>
- <stream mime="audio/mpeg" uri="http://streamer.radiorevolt.no:8000/revolt";
codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo"
bitrate="128 kbps" />
+ <stream mime="audio/aac"
uri="http://streamer.radiorevolt.no:8000/revolt.aac"; codec="AAC, v4 LC"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <stream mime="audio/ogg"
uri="http://streamer.radiorevolt.no:8000/revolt.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://www.radiorevolt.no/</uri>
</station>
<!-- Non-streamable as of 2016/07/07
@@ -876,6 +877,30 @@
<stream mime="audio/ogg"
uri="http://streamer.radiocampus.be:8000/stream_hi.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
<uri>http://www.radiocampus.be/</uri>
</station>
+ <station band="93.5FM" id="franceculture" lang="fr" name="France Culture"
rank="1.0" type="public">
+ <frequency uri="http://www.franceculture.fr/";>93.5 FM in Paris,
France</frequency>
+ <location>Paris, France</location>
+ <description lang="en">France Culture is a French public radio channel and
part of Radio France. Its programming encompasses a wide variety of features on
historical, philosophical, sociopolitical, and scientific themes (including
debates, discussions, and documentaries), as well as literary readings, radio
plays, and experimental productions. The channel is broadcast nationwide on FM
and is also available online.</description>
+ <stream mime="audio/mpeg"
uri="http://direct.franceculture.fr/live/franceculture-midfi.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps"
/>
+ <stream mime="audio/mpeg"
uri="http://direct.franceculture.fr/live/franceculture-lofi.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps"
/>
+ <uri>http://www.franceculture.fr/</uri>
+ </station>
+ <station band="105.5FM" id="franceinfo" lang="fr" name="France Info"
rank="1.0" type="public">
+ <frequency uri="http://www.franceinfo.fr/";>105.5 FM in Paris,
France</frequency>
+ <location>Paris, France</location>
+ <description lang="en">France Info is a radio network operated by the
French public service radio broadcaster Radio France. It provides continuous
live news and information. Broadcasting on FM (as well as being streamed on the
internet), France Info is receivable across France and audible too in the
border regions of neighbouring countries, including southern parts of the
United Kingdom, especially the southeastern coastal region of
England.</description>
+ <stream mime="audio/mpeg"
uri="http://direct.franceinfo.fr/live/franceinfo-midfi.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps"
/>
+ <stream mime="audio/mpeg"
uri="http://direct.franceinfo.fr/live/franceinfo-lofi.mp3"; codec="MPEG 1 Audio,
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps" />
+ <uri>http://www.franceinfo.fr/</uri>
+ </station>
+ <station band="87.8FM" id="franceinter" lang="fr" name="France Inter"
rank="1.0" type="public">
+ <frequency uri="http://www.franceinter.fr/";>87.8 FM in Paris,
France</frequency>
+ <location>Paris, France</location>
+ <description lang="en">France Inter is a major French public radio channel
and part of Radio France. It is a "generalist" station, aiming to provide a
wide national audience with a full service of news and spoken-word programming,
both serious and entertaining, liberally punctuated with an eclectic mix of
music. France Inter broadcasts on FM transmitters across France, and via the
internet.</description>
+ <stream mime="audio/mpeg"
uri="http://direct.franceinter.fr/live/franceinter-midfi.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps"
/>
+ <stream mime="audio/mpeg"
uri="http://direct.franceinter.fr/live/franceinter-lofi.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps"
/>
+ <uri>http://www.franceinter.fr/</uri>
+ </station>
<station band="93.9FM" id="radiocampusparis" lang="fr" name="Radio Campus
Paris" rank="1.0" type="edu">
<frequency uri="http://www.radiocampusparis.org/";>93.9 FM in Paris,
France</frequency>
<location>Paris, France</location>
