diff --git a/NEWS b/NEWS index 2a1de80598f13b84a506e448854a2f3567d443e5..2aada588c84846712d65a8d2c052d5c37974484f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,27 @@ +============= +Version 1.6.0 +============= + +Appdata + + * data/Makefile.am: Install appdata in /usr/share/metainfo (#1517451) + +Autotools + + * configure.ac: Remove dependency on gstreamer-plugins-good-1.0 codec + +Build + * gnome-internet-radio-locator.spec.in: #1517451 (Red Hat Bugzilla) + +Documentation + + * help/sv/sv.po: New Swedish help translation (Isak Ostlund) + +GUI + + * src/gnome-internet-radio-locator-markers.c: Add Copenhagen, Denmark + * src/gnome-internet-radio-locator-markers.c: Add Stockholm, Sweden + ============= Version 1.5.0 ============= diff --git a/compile b/compile index a85b723c7e67d46316e85e7422bd5088e9136042..de0005d4f9f4018db22e6fd9665d589f3c626dde 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/configure.ac b/configure.ac index 0566a171ea935039479b54435c97157dca799a2d..4fce822eb0fb0d948232312ea7e3cef18cc577e7 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,1.5.0) +AC_INIT(gnome-internet-radio-locator,1.6.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]) @@ -96,7 +96,6 @@ PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR, gstreamer-video-1.0 \ gstreamer-plugins-bad-1.0 \ gstreamer-plugins-base-1.0 \ - gstreamer-plugins-good-1.0 \ gtk+-3.0 >= 3.0 \ libxml-2.0 >= 2.0 \ pangoft2 >= 0.28) diff --git a/data/Makefile.am b/data/Makefile.am index 34b2fdf42cc2816f569ffa5cdf7b16088d0da648..7317c438cc9e283b2a59a829778eaf44f20e1d37 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,7 +9,7 @@ desktopdir = $(datadir)/applications desktop_DATA = $(DESKTOP_FILES) @INTLTOOL_XML_RULE@ -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo appdata_in_files = gnome-internet-radio-locator.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) diff --git a/gnome-internet-radio-locator.spec.in b/gnome-internet-radio-locator.spec.in index 2f853bfc1ddcb5f4012f3523d4507a6185424957..c1bf1cdf26c222cc7d0f527bfd15c5a21ab7359a 100644 --- a/gnome-internet-radio-locator.spec.in +++ b/gnome-internet-radio-locator.spec.in @@ -43,7 +43,7 @@ Enjoy Free Internet Radio. %find_lang %{name} --with-man %check -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang %doc AUTHORS NEWS README TODO ChangeLog @@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/%{name}.1* %changelog +* Sun Jan 13 2019 Ole Aamot - 1.6.0-0 +- gnome-internet-radio-locator 1.6.0 build on Fedora Linux 29 + * Fri Dec 28 2018 Ole Aamot - 1.5.0-0 - gnome-internet-radio-locator 1.5.0 build on Fedora Linux 29 diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c index 0d1ad9c4f462f3b3d114270fe50e5794049cd2eb..6fe4f304b1f52630d5ded6fd81da7fdf32aa4cd7 100644 --- a/src/gnome-internet-radio-locator-markers.c +++ b/src/gnome-internet-radio-locator-markers.c @@ -199,6 +199,17 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat /* 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("Copenhagen, Denmark\nDanmarks Radio Nyheder"); + 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), 55.6867243, 12.5700724); + 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("Chicago, Illinois\nWHPK"); champlain_label_set_text (CHAMPLAIN_LABEL (marker), station); champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE); @@ -434,6 +445,17 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat /* 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("Stockholm, Sweden\nSveriges Radio P1"); + 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), 59.3251172, 18.0710935); + 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("Sydney, Canada\nCaper Radio"); champlain_label_set_text (CHAMPLAIN_LABEL (marker), station); champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);