Witam! Przesyłam łatkę do wersji 0.54.1: - system budowania zmienił się na Cmake, - buduje się i działa na Th, - działa też z Operą i Amarokiem (któraś wcześniejsza wersja nie pokazywała menu), - z QtCurve-amd64.patch zostawiłem tylko to co dotyczy Gtk1-0.42.2, - jakaś podpowiedź co zrobić z wersją Qt4/KDE4 ?
Proszę o uwagi i ewentualne dodanie:) Pozdrawiam Łukasz Piotrowiak
--- QtCurve.spec 2007-10-01 00:31:09.000000000 +0200 +++ QtCurve.spec.new 2007-10-02 18:40:54.000000000 +0200 @@ -7,28 +7,27 @@ %bcond_with gtk # build GTK styles %bcond_without gtk2 # don't build GTK+2 styles # -%define kde_ver 0.53 -%define gtk2_ver 0.53 +%define kde_ver 0.54.1 +%define gtk2_ver 0.54.1 %define gtk1_ver 0.42.2 Summary: A free and corrected port of Red Hat's GTK+/Qt theme Summary(pl.UTF-8): Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata Name: QtCurve -Version: 0.53 +Version: 0.54.1 Release: 1 License: GPL Group: Themes -Source0: http://home.freeuk.com/cpdrummond/%{name}-KDE3-%{kde_ver}.tar.gz -# Source0-md5: 6103ae2522b0a58aba0b611560abc793 -Source1: http://home.freeuk.com/cpdrummond/%{name}-Gtk2-%{gtk2_ver}.tar.gz -# Source1-md5: ee215112273fae935d22adaa216c85a4 +Source0: http://home.freeuk.com/cpdrummond/%{name}-KDE3-%{kde_ver}.tar.bz2 +# Source0-md5: cc26c241aa031f80383dc314b21f336a +Source1: http://home.freeuk.com/cpdrummond/%{name}-Gtk2-%{gtk2_ver}.tar.bz2 +# Source1-md5: 0c5f42b5978b7ee0341c19081bfdb6c6 Source2: http://home.freeuk.com/cpdrummond/%{name}-Gtk1-%{gtk1_ver}.tar.gz # Source2-md5: 8219f58493ca4e65a8fe61ee76eca522 -Patch0: %{name}-amd64.patch -Patch1: kde-am110.patch -Patch2: kde-ac260-lt.patch +Patch0: %{name}-Gtk1-0.42.2-amd64.patch URL: http://www.kde-look.org/content/show.php?content=40492 BuildRequires: autoconf BuildRequires: automake +BuildRequires: cmake %{?with_gtk:BuildRequires: gtk+-devel} %{?with_gtk2:BuildRequires: gtk+2-devel} BuildRequires: kdelibs-devel >= 3.1 @@ -86,15 +85,15 @@ Summary: A free and corrected port of Redhats GTK+/Qt theme - common Summary(pl.UTF-8): Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata - common Group: Themes -Obsoletes: theme-bluecurve-common -Obsoletes: gtk2-theme-bluecurve Obsoletes: gtk-theme-bluecurve +Obsoletes: gtk2-theme-bluecurve Obsoletes: kde-style-bluecurve Obsoletes: kde-theme-bluecurve +Obsoletes: theme-bluecurve-common %description -n theme-QtCurve-common -A free and corrected port of Red Hat's GTK+/Qt theme. -Documentation and common files package. +A free and corrected port of Red Hat's GTK+/Qt theme. Documentation +and common files package. %description -n theme-QtCurve-common -l pl.UTF-8 Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata. @@ -102,19 +101,12 @@ %prep %setup -q -c -a1 -a2 -#%patch0 -p1 -cd %{name}-KDE3-%{kde_ver} -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 %build -cd %{name}-KDE3-%{kde_ver} -cp /usr/share/automake/config.sub admin - -%{__make} -f admin/Makefile.common cvs -%configure \ - --with-qt-libraries=%{_libdir} +cd %{name}-KDE3-%{kde_ver} +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . %{__make} cd - @@ -132,12 +124,10 @@ %if %{with gtk2} cd %{name}-Gtk2-%{gtk2_ver} -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -%configure +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DQTC_ADD_EVENT_FILTER=true \ + -DQTC_MODIFY_MOZILLA=true \ + -DQTC_MODIFY_MOZILLA_USER_JS=true %{__make} cd - %endif @@ -167,7 +157,6 @@ %defattr(644,root,root,755) %{_libdir}/kde3/kstyle_qtcurve_config.la %attr(755,root,root) %{_libdir}/kde3/kstyle_qtcurve_config.so -%{_libdir}/kde3/plugins/styles/*.la %attr(755,root,root) %{_libdir}/kde3/plugins/styles/*.so %{_datadir}/apps/kstyle/themes/qtcurve*.themerc %{_datadir}/apps/QtCurve
--- QtCurve-0.45/QtCurve-Gtk1-0.42.2/gtk/Makefile.am.orig 2006-07-23 14:41:26.000000000 +0200 +++ QtCurve-0.45/QtCurve-Gtk1-0.42.2/gtk/Makefile.am 2006-11-18 16:15:43.108926732 +0100 @@ -1,5 +1,5 @@ INCLUDES = $(GTK_CFLAGS) -enginedir = $(GTK_PREFIX)/lib/gtk/themes/engines +enginedir = $(libdir)/gtk/themes/engines engine_LTLIBRARIES = libqtcurve.la libqtcurve_la_SOURCES = qtcurve.c libqtcurve_la_LDFLAGS = -module -avoid-version @@ -7,6 +7,6 @@ noinst_HEADERS = qtcurve.h common.h EXTRA_DIST = qt_settings.c gtkrc config_file.c -themedir = $(GTK_PREFIX)/share/themes/QtCurve/gtk +themedir = $(datadir)/themes/QtCurve/gtk theme_DATA = gtkrc
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
