From 3a9424b4ae9ac84c5aaafb81161fe078220b0dce Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Jun 10 2013 11:47:45 +0000 Subject: Add hi-res icons (http://sourceforge.net/p/xchat/bugs/1504/) --- diff --git a/hicolor_apps_16x16_xchat.png b/hicolor_apps_16x16_xchat.png new file mode 100644 index 0000000..b29fc17 Binary files /dev/null and b/hicolor_apps_16x16_xchat.png differ diff --git a/hicolor_apps_22x22_xchat.png b/hicolor_apps_22x22_xchat.png new file mode 100644 index 0000000..5f4a083 Binary files /dev/null and b/hicolor_apps_22x22_xchat.png differ diff --git a/hicolor_apps_24x24_xchat.png b/hicolor_apps_24x24_xchat.png new file mode 100644 index 0000000..51589bd Binary files /dev/null and b/hicolor_apps_24x24_xchat.png differ diff --git a/hicolor_apps_256x256_xchat.png b/hicolor_apps_256x256_xchat.png new file mode 100644 index 0000000..f5dd9ca Binary files /dev/null and b/hicolor_apps_256x256_xchat.png differ diff --git a/hicolor_apps_32x32_xchat.png b/hicolor_apps_32x32_xchat.png new file mode 100644 index 0000000..59b1850 Binary files /dev/null and b/hicolor_apps_32x32_xchat.png differ diff --git a/hicolor_apps_48x48_xchat.png b/hicolor_apps_48x48_xchat.png new file mode 100644 index 0000000..47db53e Binary files /dev/null and b/hicolor_apps_48x48_xchat.png differ diff --git a/xchat-2.8.8-hires-icons.patch b/xchat-2.8.8-hires-icons.patch new file mode 100644 index 0000000..2baba84 --- /dev/null +++ b/xchat-2.8.8-hires-icons.patch @@ -0,0 +1,85 @@ +diff -urNp xchat-2.8.8.orig/configure.in xchat-2.8.8/configure.in +--- xchat-2.8.8.orig/configure.in 2013-06-07 17:33:41.600172433 +0200 ++++ xchat-2.8.8/configure.in 2013-06-07 17:39:02.672190284 +0200 +@@ -792,6 +792,7 @@ plugins/python/Makefile + plugins/perl/Makefile + plugins/tcl/Makefile + intl/Makefile ++icons/Makefile + po/Makefile.in + ]) + +diff -urNp xchat-2.8.8.orig/icons/Makefile.am xchat-2.8.8/icons/Makefile.am +--- xchat-2.8.8.orig/icons/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xchat-2.8.8/icons/Makefile.am 2013-06-07 17:35:09.053456817 +0200 +@@ -0,0 +1,59 @@ ++public_icon_themes = \ ++ hicolor \ ++ $(NULL) ++ ++public_icons = \ ++ hicolor_apps_16x16_xchat.png \ ++ hicolor_apps_22x22_xchat.png \ ++ hicolor_apps_24x24_xchat.png \ ++ hicolor_apps_32x32_xchat.png \ ++ hicolor_apps_48x48_xchat.png \ ++ hicolor_apps_256x256_xchat.png \ ++ $(NULL) ++ ++noinst_DATA = \ ++ xchat.svg \ ++ $(NULL) ++ ++EXTRA_DIST = \ ++ $(public_icons) \ ++ $(noinst_DATA) \ ++ $(NULL) ++ ++gtk_update_icon_cache = gtk-update-icon-cache -f -t ++ ++update-icon-cache: ++ @-if test -z "$(DESTDIR)"; then \ ++ echo "Updating Gtk icon cache."; \ ++ for theme in $(public_icon_themes); do \ ++ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ ++ done; \ ++ else \ ++ echo "*** Icon cache not updated. After (un)install, run this:"; \ ++ for theme in $(public_icon_themes); do \ ++ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ ++ done; \ ++ fi ++ ++install-icons: ++ for icon in $(public_icons); do \ ++ THEME=`echo $$icon | cut -d_ -f1`; \ ++ CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++ SIZE=`echo $$icon | cut -d_ -f3`; \ ++ ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ ++ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++ done ++ ++uninstall-icons: ++ -for icon in $(public_icons); do \ ++ THEME=`echo $$icon | cut -d_ -f1`; \ ++ CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++ SIZE=`echo $$icon | cut -d_ -f3`; \ ++ ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++ done ++ ++install-data-local: install-icons update-icon-cache ++ ++uninstall-local: uninstall-icons update-icon-cache +diff -urNp xchat-2.8.8.orig/Makefile.am xchat-2.8.8/Makefile.am +--- xchat-2.8.8.orig/Makefile.am 2013-06-07 17:33:41.600172433 +0200 ++++ xchat-2.8.8/Makefile.am 2013-06-10 13:25:06.316773350 +0200 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = po intl src plugins ++SUBDIRS = po icons intl src plugins + + EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html xchat.png \ + xchat.desktop xchat.spec config.h.w32 xchat.ico diff --git a/xchat.spec b/xchat.spec index 6855528..3120802 100644 --- a/xchat.spec +++ b/xchat.spec @@ -4,12 +4,22 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.8.8 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ URL: http://www.xchat.org -Source: http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.xz +Source0: http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.xz + +# http://sourceforge.net/p/xchat/bugs/1504/ +Source1: hicolor_apps_16x16_%{name}.png +Source2: hicolor_apps_22x22_%{name}.png +Source3: hicolor_apps_24x24_%{name}.png +Source4: hicolor_apps_32x32_%{name}.png +Source5: hicolor_apps_48x48_%{name}.png +Source6: hicolor_apps_256x256_%{name}.png +Source7: %{name}.svg + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Patches 0-9 reserved for official xchat.org patches @@ -36,6 +46,9 @@ Patch52: xchat-2.8.8-libnotify07.patch Patch53: xchat-2.8.8-link-against-libnotify.patch # Only glib.h can be included and g_thread_init should no longer be used Patch54: xchat-2.8.8-glib.patch +# http://sourceforge.net/p/xchat/bugs/1504/ +Patch55: xchat-2.8.8-hires-icons.patch + BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel BuildRequires: GConf2-devel BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60 @@ -48,6 +61,8 @@ BuildRequires: desktop-file-utils >= 0.10 BuildRequires: libnotify-devel # For xchat-2.8.8-link-against-libnotify.patch BuildRequires: autoconf +BuildRequires: automake + # For gconftool-2: Requires(post): GConf2 >= %{gconf_version} Requires(preun): GConf2 >= %{gconf_version} @@ -91,9 +106,18 @@ This package contains the X-Chat plugin providing the Tcl scripting interface. %patch52 -p1 -b .libnotify07 %patch53 -p1 -b .link-against-libnotify %patch54 -p0 -b .glib +%patch55 -p1 -b .hires-icons sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c +cp -p %{SOURCE1} icons/ +cp -p %{SOURCE2} icons/ +cp -p %{SOURCE3} icons/ +cp -p %{SOURCE4} icons/ +cp -p %{SOURCE5} icons/ +cp -p %{SOURCE6} icons/ +cp -p %{SOURCE7} icons/ + %build # Remove CVS files from source dirs so they're not installed into doc dirs. find . -name CVS -type d | xargs rm -rf @@ -102,8 +126,7 @@ export CFLAGS="$RPM_OPT_FLAGS $(perl -MExtUtils::Embed -e ccopts)" export LDFLAGS=$(perl -MExtUtils::Embed -e ldopts) # For xchat-2.8.8-link-against-libnotify.patch -autoconf -autoheader +./autogen.sh %configure --disable-textfe \ --enable-gtkfe \ @@ -152,18 +175,14 @@ EOF export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : - -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : fi -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : -fi +%posttrans +/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -178,6 +197,7 @@ fi %{_libdir}/xchat/plugins/perl.so %{_libdir}/xchat/plugins/python.so %{_datadir}/applications/xchat.desktop +%{_datadir}/icons/hicolor/*/apps/xchat.png %{_datadir}/pixmaps/* %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas %{_datadir}/dbus-1/services/org.xchat.service.service @@ -187,6 +207,9 @@ fi %{_libdir}/xchat/plugins/tcl.so %changelog +* Fri Jun 07 2013 Debarshi Ray - 1:2.8.8-18 +- Add hi-res icons (http://sourceforge.net/p/xchat/bugs/1504/) + * Fri Feb 15 2013 Fedora Release Engineering - 1:2.8.8-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/xchat.svg b/xchat.svg new file mode 100644 index 0000000..c7055d8 --- /dev/null +++ b/xchat.svg @@ -0,0 +1,1802 @@ + + + + + Pidgin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Pidgin + + + pidgin + im + instant + messaging + + + + + + + + + + + + + + + + + + + + + Hylke Bons, Lapo Calamandrei + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +