From 7fc707cd5336757a8851ec7199b0852a360af384 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Mon, 12 Aug 2024 10:13:32 +0800 Subject: [PATCH] Remove rpath (cherry picked from commit 2e7b3be965dde4e0231e9418483632c0f7402b1e) --- xmms-1.2.10-gcc4.patch | 24 ------------- xmms-1.2.11-arts.patch | 77 ------------------------------------------ xmms.spec | 9 +++-- 3 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 xmms-1.2.10-gcc4.patch delete mode 100644 xmms-1.2.11-arts.patch diff --git a/xmms-1.2.10-gcc4.patch b/xmms-1.2.10-gcc4.patch deleted file mode 100644 index ece297d..0000000 --- a/xmms-1.2.10-gcc4.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000 -+++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000 -@@ -49,8 +49,6 @@ - } - irConfig; - --extern pthread_t irapp_thread; --extern gboolean keepGoing; - extern irConfig ircfg; - extern gboolean irconf_is_going; - ---- xmms-1.2.10/xmms/sm.c.orig 2004-01-11 18:33:00.000000000 +0100 -+++ xmms-1.2.10/xmms/sm.c 2004-04-12 22:44:28.000000000 +0200 -@@ -147,8 +147,9 @@ - - #else - --void sm_init(int argc, char **argv, const char *previous_session_id) -+const char * sm_init(int argc, char **argv, const char *previous_session_id) - { -+ return NULL; - } - - void sm_cleanup(void) diff --git a/xmms-1.2.11-arts.patch b/xmms-1.2.11-arts.patch deleted file mode 100644 index 6d5330c..0000000 --- a/xmms-1.2.11-arts.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- xmms-1.2.11-20071117cvs/xmms/main.c 2008-09-02 19:08:34.000000000 +0100 -+++ xmms-1.2.11-20071117cvs/xmms/main-new.c 2008-09-02 19:16:29.000000000 +0100 -@@ -307,6 +307,40 @@ - sizeof(mainwin_general_menu_entries) / - sizeof(mainwin_general_menu_entries[0]); - -+#include -+#include -+ -+/* dlopen libarts, for seeing if we should use this as the default plugin. */ -+static int arts_running(void) { -+ void *arts_handle; -+ int (*a_init)(void); -+ void (*a_close)(void); -+ int ret = 0; -+ -+ arts_handle = dlopen("libartsc.so.0", RTLD_NOW); -+ if (!arts_handle) -+ return 0; -+ -+ a_init = dlsym(arts_handle, "arts_init"); -+ a_close = dlsym(arts_handle, "arts_free"); -+ if (!a_init || !a_close) { -+ dlclose(arts_handle); -+ return 0; -+ } -+ signal(SIGPIPE, SIG_DFL); -+ if ((*a_init)() == 0) { -+ ret = 1; -+ /* there are problems with library unloading in conjunction with X11, */ -+ /* (Arts::X11GlobalComm), so we don't unload stuff here */ -+ /* (*a_close)(); */ -+ } -+ signal(SIGPIPE, SIG_IGN); -+ dlclose(arts_handle); -+ return ret; -+} -+ -+ -+ - static void make_xmms_dir(void) - { - gchar *filename; -@@ -503,6 +537,19 @@ - cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip"); - if (cfg.outputplugin == NULL) - { -+ /* If aRts is running and the plugin is there, use that... */ -+ if (arts_running()) -+ { -+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]); -+ if (access(cfg.outputplugin, X_OK)) -+ { -+ g_free(cfg.outputplugin); -+ cfg.outputplugin = NULL; -+ } -+ } -+ } -+ if (cfg.outputplugin == NULL) -+ { - #ifdef HAVE_OSS - cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]); - #elif defined(sun) -@@ -515,6 +562,13 @@ - cfg.outputplugin = g_strdup(""); - #endif - } -+ /* Migrate users of the previous arts plugin */ -+ if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) { -+ if (access(cfg.outputplugin,X_OK)) { -+ g_free(cfg.outputplugin); -+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]); -+ } -+ } - if (cfg.eqpreset_default_file == NULL) - cfg.eqpreset_default_file = g_strdup("dir_default.preset"); - if (cfg.eqpreset_extension == NULL) diff --git a/xmms.spec b/xmms.spec index 47f29d0..ca51dcc 100644 --- a/xmms.spec +++ b/xmms.spec @@ -1,7 +1,7 @@ Name: xmms Epoch: 1 Version: 1.2.11 -Release: 42.20071117cvs +Release: 43.20071117cvs License: GPLv2+ Summary: XMMS is a legacy GTK+1 music player modeled after Winamp URL: https://git.conf.top/public/rpmbuild/src/master/xmms @@ -13,7 +13,7 @@ Source4: xmms.desktop Provides: xmms-esd = 1:%{version}-%{release} xmms-gui bundled(libmpg123) xmms-mp3 = %{version}-%{release} xmms-libs = 1:%{version}-%{release} Obsoletes: xmms-esd < 1:18.20071117cvs xmms-mp3 < 1.2.11-8 xmms-libs < 1:%{version}-%{release} BuildRequires: gtk+-devel alsa-lib-devel libogg-devel libvorbis-devel mikmod-devel gettext-devel -BuildRequires: zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils gcc +BuildRequires: zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils gcc chrpath Requires: unzip libcanberra-gtk2 gtk2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -76,6 +76,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} install -Dpm 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc %find_lang xmms +chrpath -d %{buildroot}/%{_libexecdir}/* + %post /sbin/ldconfig %postun @@ -102,6 +104,9 @@ install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc %{_mandir}/man1/*xmms.1* %changelog +* Mon Aug 12 2024 wangkai <13474090681@163.com> - 1:1.2.11-43.20071117cvs +- Remove rpath + * Wed Oct 26 2022 wuzx - 1:1.2.11-42.20071117cvs - Add sw64 architecture