Date: Sunday, March 12, 2023 @ 16:34:56 Author: jelle Revision: 1419384
archrelease: copy trunk to community-x86_64 Added: lxmusic/repos/community-x86_64/0001-Use-themed-icon.patch (from rev 1419383, lxmusic/trunk/0001-Use-themed-icon.patch) lxmusic/repos/community-x86_64/PKGBUILD (from rev 1419383, lxmusic/trunk/PKGBUILD) lxmusic/repos/community-x86_64/lxmusic.appdata.xml (from rev 1419383, lxmusic/trunk/lxmusic.appdata.xml) Deleted: lxmusic/repos/community-x86_64/0001-Use-themed-icon.patch lxmusic/repos/community-x86_64/PKGBUILD lxmusic/repos/community-x86_64/lxmusic.appdata.xml ----------------------------+ 0001-Use-themed-icon.patch | 98 +++++++++++++++++++++---------------------- PKGBUILD | 80 +++++++++++++++++------------------ lxmusic.appdata.xml | 42 +++++++++--------- 3 files changed, 110 insertions(+), 110 deletions(-) Deleted: 0001-Use-themed-icon.patch =================================================================== --- 0001-Use-themed-icon.patch 2023-03-12 16:34:47 UTC (rev 1419383) +++ 0001-Use-themed-icon.patch 2023-03-12 16:34:56 UTC (rev 1419384) @@ -1,49 +0,0 @@ -From f4c172d9c61700aa1f26ccaa154aa0d66093bb8f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sun, 2 May 2021 13:50:30 +0200 -Subject: [PATCH] Use themed icon - -Also put the icon under the hicolor icon hierarchy. ---- - data/Makefile.am | 2 +- - src/lxmusic.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index c7679de..f612733 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -4,7 +4,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - desktopdir=$(datadir)/applications - - icon_DATA=lxmusic.png --icondir=$(datadir)/pixmaps -+icondir=$(datadir)/icons/hicolor/128x128/apps - - man_MANS = lxmusic.1 - -diff --git a/src/lxmusic.c b/src/lxmusic.c -index 60efc61..5e55aa4 100644 ---- a/src/lxmusic.c -+++ b/src/lxmusic.c -@@ -265,7 +265,7 @@ void on_about(GtkWidget* mi, gpointer data) - - about = gtk_about_dialog_new(); - gtk_about_dialog_set_program_name( (GtkAboutDialog*)about, "LXMusic" ); -- gtk_about_dialog_set_logo((GtkAboutDialog*)about, gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL)); -+ gtk_about_dialog_set_logo_icon_name((GtkAboutDialog*)about, "lxmusic"); - gtk_about_dialog_set_version( (GtkAboutDialog*)about, VERSION ); - gtk_about_dialog_set_authors( (GtkAboutDialog*)about, authors ); - gtk_about_dialog_set_artists( (GtkAboutDialog*)about, artists ); -@@ -2395,7 +2395,7 @@ static void setup_ui() - gtk_builder_connect_signals(builder, NULL); - - /* window icon */ -- gtk_window_set_icon_from_file(GTK_WINDOW(main_win), PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL ); -+ gtk_window_set_icon_name(GTK_WINDOW(main_win), "lxmusic"); - - gtk_window_set_default_size(GTK_WINDOW(main_win), win_width, win_height); - /* this can trigger signal handler and show or hide the playlist. */ --- -2.31.1 - Copied: lxmusic/repos/community-x86_64/0001-Use-themed-icon.patch (from rev 1419383, lxmusic/trunk/0001-Use-themed-icon.patch) =================================================================== --- 0001-Use-themed-icon.patch (rev 0) +++ 0001-Use-themed-icon.patch 2023-03-12 16:34:56 UTC (rev 1419384) @@ -0,0 +1,49 @@ +From f4c172d9c61700aa1f26ccaa154aa0d66093bb8f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sun, 2 May 2021 13:50:30 +0200 +Subject: [PATCH] Use themed icon + +Also put the icon under the hicolor icon hierarchy. +--- + data/Makefile.am | 2 +- + src/lxmusic.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index c7679de..f612733 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -4,7 +4,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + desktopdir=$(datadir)/applications + + icon_DATA=lxmusic.png +-icondir=$(datadir)/pixmaps ++icondir=$(datadir)/icons/hicolor/128x128/apps + + man_MANS = lxmusic.1 + +diff --git a/src/lxmusic.c b/src/lxmusic.c +index 60efc61..5e55aa4 100644 +--- a/src/lxmusic.c ++++ b/src/lxmusic.c +@@ -265,7 +265,7 @@ void on_about(GtkWidget* mi, gpointer data) + + about = gtk_about_dialog_new(); + gtk_about_dialog_set_program_name( (GtkAboutDialog*)about, "LXMusic" ); +- gtk_about_dialog_set_logo((GtkAboutDialog*)about, gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL)); ++ gtk_about_dialog_set_logo_icon_name((GtkAboutDialog*)about, "lxmusic"); + gtk_about_dialog_set_version( (GtkAboutDialog*)about, VERSION ); + gtk_about_dialog_set_authors( (GtkAboutDialog*)about, authors ); + gtk_about_dialog_set_artists( (GtkAboutDialog*)about, artists ); +@@ -2395,7 +2395,7 @@ static void setup_ui() + gtk_builder_connect_signals(builder, NULL); + + /* window icon */ +- gtk_window_set_icon_from_file(GTK_WINDOW(main_win), PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL ); ++ gtk_window_set_icon_name(GTK_WINDOW(main_win), "lxmusic"); + + gtk_window_set_default_size(GTK_WINDOW(main_win), win_width, win_height); + /* this can trigger signal handler and show or hide the playlist. */ +-- +2.31.1 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-03-12 16:34:47 UTC (rev 1419383) +++ PKGBUILD 2023-03-12 16:34:56 UTC (rev 1419384) @@ -1,40 +0,0 @@ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Marcus Schulderinsky <mmaacceess at gmail dot com> - -pkgname=lxmusic -pkgver=0.4.7 -pkgrel=6 -pkgdesc='Lightweight music player (XMMS2 client)' -arch=('x86_64') -url='https://lxde.org/' -license=('GPL2') -groups=('lxde') -depends=('gtk3' 'libnotify' 'xmms2') -makedepends=('intltool') -replaces=('lxmusic-gtk3') -source=("https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz" - 'lxmusic.appdata.xml' - '0001-Use-themed-icon.patch') -sha256sums=('4933987338eb6e8c77d63b14cea5a8886146e75acbc38a21438c6c3f47bc06ba' - '0093885fe76bda60a1b319970bd8d148903a3adb674690d3d9cf9262e053b05b' - '9cd869db22ac71c01e90365d9252b72bde64ec9f0a0bad8fecc32319da0a99fe') - -prepare() { - cd $pkgname-$pkgver - # Use themed icon - patch -Np1 -i ../0001-Use-themed-icon.patch - autoreconf -fi -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-gtk3 - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" -} Copied: lxmusic/repos/community-x86_64/PKGBUILD (from rev 1419383, lxmusic/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-03-12 16:34:56 UTC (rev 1419384) @@ -0,0 +1,40 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Contributor: Marcus Schulderinsky <mmaacceess at gmail dot com> + +pkgname=lxmusic +pkgver=0.4.7 +pkgrel=7 +pkgdesc='Lightweight music player (XMMS2 client)' +arch=('x86_64') +url='https://lxde.org/' +license=('GPL2') +groups=('lxde') +depends=('gtk3' 'libnotify' 'xmms2') +makedepends=('intltool') +replaces=('lxmusic-gtk3') +source=("https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz" + 'lxmusic.appdata.xml' + '0001-Use-themed-icon.patch') +sha256sums=('4933987338eb6e8c77d63b14cea5a8886146e75acbc38a21438c6c3f47bc06ba' + '0093885fe76bda60a1b319970bd8d148903a3adb674690d3d9cf9262e053b05b' + '9cd869db22ac71c01e90365d9252b72bde64ec9f0a0bad8fecc32319da0a99fe') + +prepare() { + cd $pkgname-$pkgver + # Use themed icon + patch -Np1 -i ../0001-Use-themed-icon.patch + autoreconf -fi +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-gtk3 + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" +} Deleted: lxmusic.appdata.xml =================================================================== --- lxmusic.appdata.xml 2023-03-12 16:34:47 UTC (rev 1419383) +++ lxmusic.appdata.xml 2023-03-12 16:34:56 UTC (rev 1419384) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component type="desktop-application"> - <id>org.lxde.lxmusic</id> - <launchable type="desktop-id">lxmusic.desktop</launchable> - <name>LXMusic</name> - <summary>Play your music files easily</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0</project_license> - <developer_name>LXDE team</developer_name> - <description> - <p>LXMusic is the minimalist music player for LXDE. It is a graphical user interface (GUI) for the audio player xmms2, which is lightweight and incorporates a server/client design. LXMusic is simple to operate: the user can build multiple playlists of audio files (and xmms2-supported audio streams), and LXMusic plays a selected playlist. A wide variety of audio formats can be played by LXMusic by installing the appropriate xmms2 plugins.</p> - </description> - <screenshots> - <screenshot type="default"> - <image>https://wiki.lxde.org/en/images/7/73/LXSMusic.png</image> - </screenshot> - </screenshots> - <url type="bugtracker">https://sourceforge.net/p/lxde/bugs/search/?q=labels:lxmusic</url> - <url type="homepage">https://www.lxde.org/</url> - <translation type="gettext">lxmusic</translation> -</component> Copied: lxmusic/repos/community-x86_64/lxmusic.appdata.xml (from rev 1419383, lxmusic/trunk/lxmusic.appdata.xml) =================================================================== --- lxmusic.appdata.xml (rev 0) +++ lxmusic.appdata.xml 2023-03-12 16:34:56 UTC (rev 1419384) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>org.lxde.lxmusic</id> + <launchable type="desktop-id">lxmusic.desktop</launchable> + <name>LXMusic</name> + <summary>Play your music files easily</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <developer_name>LXDE team</developer_name> + <description> + <p>LXMusic is the minimalist music player for LXDE. It is a graphical user interface (GUI) for the audio player xmms2, which is lightweight and incorporates a server/client design. LXMusic is simple to operate: the user can build multiple playlists of audio files (and xmms2-supported audio streams), and LXMusic plays a selected playlist. A wide variety of audio formats can be played by LXMusic by installing the appropriate xmms2 plugins.</p> + </description> + <screenshots> + <screenshot type="default"> + <image>https://wiki.lxde.org/en/images/7/73/LXSMusic.png</image> + </screenshot> + </screenshots> + <url type="bugtracker">https://sourceforge.net/p/lxde/bugs/search/?q=labels:lxmusic</url> + <url type="homepage">https://www.lxde.org/</url> + <translation type="gettext">lxmusic</translation> +</component>