Merged v0.2.8 development branch

ebruck · Aug 21, 2021 · 20a7904 · 20a7904
1 parent 84648e8
commit 20a7904
Show file tree

Hide file tree

Showing 23 changed files with 106 additions and 130 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,57 +29,35 @@ commonStepsFedora: &commonStepsFedora
 version: 2.1
 
 jobs:
-  Ubuntu-16_04-build:
-    <<: *commonStepsUbuntu
-    docker:
-      - image: "radiotrayng/circleci:ubuntu-16.04"
-    environment:
-      - CI_OS: linux
   Ubuntu-18_04-build:
     <<: *commonStepsUbuntu
     docker:
       - image: "radiotrayng/circleci:ubuntu-18.04"
     environment:
       - CI_OS: linux
-  Ubuntu-19_04-build:
-    <<: *commonStepsUbuntu
-    docker:
-      - image: "radiotrayng/circleci:ubuntu-19.04"
-    environment:
-      - CI_OS: linux
-  Ubuntu-19_10-build:
-    <<: *commonStepsUbuntu
-    docker:
-      - image: "radiotrayng/circleci:ubuntu-19.10"
-    environment:
-      - CI_OS: linux
   Ubuntu-20_04-build:
     <<: *commonStepsUbuntu
     docker:
       - image: "radiotrayng/circleci:ubuntu-20.04"
     environment:
       - CI_OS: linux
-  Fedora-30-build:
-    <<: *commonStepsFedora
+  Ubuntu-21_04-build:
+    <<: *commonStepsUbuntu
     docker:
-      - image: "radiotrayng/circleci:fedora-30"
+      - image: "radiotrayng/circleci:ubuntu-21.04"
     environment:
       - CI_OS: linux
-  Fedora-31-build:
+  Fedora-34-build:
     <<: *commonStepsFedora
     docker:
-      - image: "radiotrayng/circleci:fedora-31"
+      - image: "radiotrayng/circleci:fedora-34"
     environment:
       - CI_OS: linux
-
 workflows:
   version: 2
   build:
     jobs:
-      - Ubuntu-16_04-build
       - Ubuntu-18_04-build
-      - Ubuntu-19_04-build
-      - Ubuntu-19_10-build
       - Ubuntu-20_04-build
-      - Fedora-30-build
-      - Fedora-31-build
+      - Ubuntu-21_04-build
+      - Fedora-34-build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 # version for user agent creation
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 2)
-set(PROJECT_VERSION_PATCH 7)
+set(PROJECT_VERSION_PATCH 8)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # output dir
@@ -44,7 +44,6 @@ endif()
 unset(ret)
 set(wxWidgets_CONFIG_OPTIONS "${wxWidgets_CONFIG_OPTIONS_DEFAULT}" ON STRING "wxWidgets toolkit options")
 find_package(wxWidgets REQUIRED core base adv)
-
 pkg_search_module(JSONCPP     REQUIRED jsoncpp)
 pkg_search_module(GSTREAMER   REQUIRED gstreamer-1.0)
 pkg_search_module(XDG_BASEDIR REQUIRED libxdg-basedir)
@@ -67,7 +66,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_D
 
 # notification & ncurses based on platform
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    pkg_search_module(APPINDICATOR REQUIRED appindicator3-0.1)
+    pkg_search_module(APPINDICATOR appindicator3-0.1)
+    if (NOT APPINDICATOR_FOUND)
+        pkg_search_module(APPINDICATOR REQUIRED ayatana-appindicator3-0.1)
+        if (APPINDICATOR_FOUND)
+            set(AYATANA_APPINDICATOR true)
+        endif()
+    endif()
 if (NOT APPINDICATOR_FOUND)
     pkg_search_module(NCURSES      REQUIRED ncurses)
 endif()

diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ The version here is what "I" wanted out of RadioTray.
 
 ## Radiotray-NG goals were: ##
 
-* Cross platform friendly design as I occasionally use a Mac.
 * Better gstreamer error handling and recovery.
 * Fix RadioTray's flawed bookmark format.
 * Build in the only RadioTray plugin that I felt I needed, which is a shutdown timer.
@@ -30,12 +29,6 @@ The version here is what "I" wanted out of RadioTray.
 * Dbus interface for controlling Radiotray-NG and accessing stream meta data
 * --play command line option for resuming playback
 
-## Future: ##
-
-* ~~Cross platform bookmark editor application.~~
-* Cross compile on Mac (via brew packages) with icons, menu, media keys etc.
-* ~~Script to convert RadioTray's bookmarks.xml to the new format.~~
-
 **Icons:** [http://www.iconsplace.com/]
 **License:** Creative Commons Attribution-NoDerivs 3.0 Unported
 
@@ -287,4 +280,4 @@ $ make package
 $ sudo dnf install ./radiotray-ng_x.y.z_<distro>_<i386|x86_64>.rpm
 ```
 
-### Thank you JetBrains for providing a free open source license for [CLion](https://www.jetbrains.com/clion/).
+### Thank you [JetBrains](https://www.jetbrains.com/?from=radiotray-ng) for providing a free open source license for [CLion](https://www.jetbrains.com/clion/?from=radiotray-ng).
diff --git a/data/bookmarks.json b/data/bookmarks.json
@@ -105,7 +105,7 @@
          },
          {
             "name" : "Rumsey Retro Radio",
-            "url" : "https://www.rumseyretro.ca/assets/rumseyretro.pls"
+            "url" : "https://www.rumseyretro.ca/ewExternalFiles/rumseyretro.pls"
          },
          {
             "name" : "WNAR-AM Radio",

diff --git a/docker/fedora/31/Dockerfile b/docker/fedora/31/Dockerfile
diff --git a/docker/fedora/30/Dockerfile → docker/fedora/34/Dockerfile b/docker/fedora/30/Dockerfile → docker/fedora/34/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:34
 
 RUN set -ex; \
     dnf -y update \

diff --git a/docker/rebuild_and_publish.sh b/docker/rebuild_and_publish.sh
@@ -2,23 +2,14 @@
 
 set -xe
 
-docker build -t radiotrayng/circleci:ubuntu-16.04 - <ubuntu/16.04/Dockerfile
-docker push radiotrayng/circleci:ubuntu-16.04
-
 docker build -t radiotrayng/circleci:ubuntu-18.04 - <ubuntu/18.04/Dockerfile
 docker push radiotrayng/circleci:ubuntu-18.04
 
-docker build -t radiotrayng/circleci:ubuntu-19.04 - <ubuntu/19.04/Dockerfile
-docker push radiotrayng/circleci:ubuntu-19.04
-
-docker build -t radiotrayng/circleci:ubuntu-19.10 - <ubuntu/19.10/Dockerfile
-docker push radiotrayng/circleci:ubuntu-19.10
-
 docker build -t radiotrayng/circleci:ubuntu-20.04 - <ubuntu/20.04/Dockerfile
 docker push radiotrayng/circleci:ubuntu-20.04
 
-docker build -t radiotrayng/circleci:fedora-30 - <fedora/30/Dockerfile
-docker push radiotrayng/circleci:fedora-30
+docker build -t radiotrayng/circleci:ubuntu-21.04 - <ubuntu/21.04/Dockerfile
+docker push radiotrayng/circleci:ubuntu-21.04
 
-docker build -t radiotrayng/circleci:fedora-31 - <fedora/31/Dockerfile
-docker push radiotrayng/circleci:fedora-31
+docker build -t radiotrayng/circleci:fedora-34 - <fedora/34/Dockerfile
+docker push radiotrayng/circleci:fedora-34
diff --git a/docker/ubuntu/16.04/Dockerfile b/docker/ubuntu/16.04/Dockerfile
diff --git a/docker/ubuntu/19.04/Dockerfile b/docker/ubuntu/19.04/Dockerfile
diff --git a/docker/ubuntu/19.10/Dockerfile → docker/ubuntu/21.04/Dockerfile b/docker/ubuntu/19.10/Dockerfile → docker/ubuntu/21.04/Dockerfile
@@ -1,8 +1,8 @@
-FROM ubuntu:19.10
+FROM ubuntu:21.04
 
 RUN set -ex; \
     apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates gcc g++ cmake curl wget git openssh-client \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates gcc g++ make cmake curl wget git openssh-client \
                    lsb-release \
                    libcurl4-openssl-dev \
                    libjsoncpp-dev \

diff --git a/include/radiotray-ng/common.hpp b/include/radiotray-ng/common.hpp
@@ -112,7 +112,7 @@ using playlist_t = std::vector<std::string>;
 #define ROOT_BOOKMARK_GROUP               "root"
 #define APP_NAME_DISPLAY                  "Radiotray-NG"
 #define APP_NAME                          "radiotray-ng"
-#define APP_COPYRIGHT                     "Copyright © 2017-2019 - The Radiotray-NG Authors"
+#define APP_COPYRIGHT                     "Copyright © 2017-2021 - The Radiotray-NG Authors"
 #define APP_AUTHOR                        "Edward G. Bruck"
 #define APP_WEBSITE                       "https://www.github.com/ebruck/radiotray-ng"
 #define RADIOTRAY_NG_LOGO_ICON            "radiotray-ng.png"

diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt
@@ -51,12 +51,22 @@ if (LSB_RELEASE_EXECUTABLE)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS       "libc6, libbsd0, libcurl4, libjsoncpp1, libxdg-basedir1, libnotify4, python3-lxml, libglibmm-2.4-1v5, libboost-filesystem${BOOST_DEB_VERSION}, libboost-system${BOOST_DEB_VERSION}, libboost-log${BOOST_DEB_VERSION}, libboost-thread${BOOST_DEB_VERSION}, libboost-program-options${BOOST_DEB_VERSION}, libgstreamer1.0-0, libappindicator3-1, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, libwxgtk3.0-gtk3-0v5")
         set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${PROJECT_SOURCE_DIR}/package/postinst;${PROJECT_SOURCE_DIR}/package/postrm;${PROJECT_SOURCE_DIR}/package/conffiles)
 
+        if (${RELEASE} STREQUAL "21.04")
+            string(REPLACE "libjsoncpp1" "libjsoncpp24" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
+        endif()
+
         # no libcurl4 on Debian Stretch
         # https://bugs.launchpad.net/ubuntu/+source/curl/+bug/1754294
         if (${RELEASE} STREQUAL "16.04" OR ${CODENAME} STREQUAL "stretch")
             string(REPLACE "libcurl4" "libcurl3" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
         endif()
 
+        # Debian no longer supports libjsoncpp1 and ubuntu appindicator package naming
+        if (${CODENAME} STREQUAL "bullseye")
+            string(REPLACE "libjsoncpp1" "libjsoncpp24" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
+            string(REPLACE "libappindicator3-1" "libayatana-appindicator3-1" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
+        endif()
+
         # official packages for older distros will continue to use gtk2 for the editor
         if (${RELEASE} STREQUAL "16.04" OR ${RELEASE} STREQUAL "18.04" OR ${RELEASE} STREQUAL "19.04" OR ${CODENAME} STREQUAL "stretch")
             message(STATUS "Official packaging assumes gtk2 dependency for 'rtng-bookmark-editor'")

diff --git a/package/changelog-deb b/package/changelog-deb
@@ -1,3 +1,11 @@
+radiotray-ng (0.2.8) unstable; urgency=low
+
+      * MATE media key support
+      * Minor cleanup & bug fixes
+
+ -- Edward G. Bruck <[email protected]>  Sat, 21 Aug 2021 12:48:02 -0700
+
+
 radiotray-ng (0.2.7) unstable; urgency=low
 
       * Removed python2 dependency

diff --git a/package/changelog-rpm b/package/changelog-rpm
@@ -1,3 +1,7 @@
+* Sat Aug 21 2021 Edward G. Bruck <[email protected]> - 0.2.8
+- MATE media key support
+- Minor cleanup & bug fixes
+
 * Sun Oct 20 2019 Edward G. Bruck <[email protected]> - 0.2.7
 - Removed python2 dependency
 - Bookmark saving no longer includes default entries

diff --git a/package/copyright b/package/copyright
@@ -1,5 +1,5 @@
 Files: *
-Copyright: 2017-2019 Edward G. Bruck <[email protected]>
+Copyright: 2017-2021 Edward G. Bruck <[email protected]>
 License: GPL+
   The full text of the GPL is distributed as in
   /usr/share/common-licenses/GPL on Debian systems.
diff --git a/package/postinst b/package/postinst
@@ -2,9 +2,17 @@
 
 set -e
 
-gtk-update-icon-cache -f -t -q /usr/share/icons/breeze/
-gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor/
-gtk-update-icon-cache -f -t -q /usr/share/icons/Yaru/
+if [ -d "/usr/share/icons/breeze" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/breeze/
+fi
+
+if [ -d "/usr/share/icons/hicolor" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor/
+fi
+
+if [ -d "/usr/share/icons/Yaru" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/Yaru/
+fi
 
 if [ -d "/usr/share/icons/ubuntu-mono-light" ]; then
 	gtk-update-icon-cache -f -t -q /usr/share/icons/ubuntu-mono-light/

diff --git a/package/postrm b/package/postrm
@@ -2,9 +2,17 @@
 
 set -e
 
-gtk-update-icon-cache -f -t -q /usr/share/icons/breeze/
-gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor/
-gtk-update-icon-cache -f -t -q /usr/share/icons/Yaru/
+if [ -d "/usr/share/icons/breeze" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/breeze/
+fi
+
+if [ -d "/usr/share/icons/hicolor" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor/
+fi
+
+if [ -d "/usr/share/icons/Yaru" ]; then
+  gtk-update-icon-cache -f -t -q /usr/share/icons/Yaru/
+fi
 
 if [ -d "/usr/share/icons/ubuntu-mono-light" ]; then
 	gtk-update-icon-cache -f -t -q /usr/share/icons/ubuntu-mono-light/

diff --git a/src/radiotray-ng/CMakeLists.txt b/src/radiotray-ng/CMakeLists.txt
@@ -1,6 +1,10 @@
 add_executable(radiotray-ng main.cpp radiotray_ng.cpp radiotray_ng.hpp)
 
 if (APPINDICATOR_FOUND)
+    if (AYATANA_APPINDICATOR)
+        target_compile_definitions(radiotray-ng PRIVATE AYATANA_APPINDICATOR)
+    endif()
+
     target_link_libraries(
         radiotray-ng
         appindicator_gui