May 2007 - openSUSE Commits - openSUSE Mailing Lists

commit ksh
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package ksh checked in at Fri May 25 17:26:52 CEST 2007. -------- --- ksh/ksh.changes 2007-04-04 12:07:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/ksh/ksh.changes 2007-05-25 10:26:10.508478000 +0200 @@ -1,0 +2,5 @@ +Fri May 25 10:25:51 CEST 2007 - werner(a)suse.de + +- Minor issuse like file permissions + +------------------------------------------------------------------- New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.c10730/_old 2007-05-25 17:26:37.000000000 +0200 +++ /var/tmp/diff_new_pack.c10730/_new 2007-05-25 17:26:37.000000000 +0200 @@ -15,16 +15,17 @@ URL: http://www.research.att.com/~gsf/download/ License: Other License(s), see package Group: System/Shells -PreReq: /bin/ln /etc/bash.bashrc +PreReq: /bin/ln /etc/bash.bashrc /bin/true Autoreqprov: on Version: 93s -Release: 2 +Release: 15 Summary: Korn Shell BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: INIT.2007-03-28.tar.bz2 Source1: ast-ksh.2007-03-28.tar.bz2 Source2: Agreement Source3: Warning +Source30: rpmlintrc Patch: ksh93.dif Patch1: workaround-stupid-build-system.diff Patch2: ksh-qemu.patch @@ -53,6 +54,7 @@ %package -n ksh-devel Summary: Korn Shell development environment Group: Development/Libraries/C and C++ +Requires: ksh = %{version}-%{release} Autoreqprov: on %description -n ksh-devel @@ -183,9 +185,9 @@ test -d $root || exit 1 pushd $root || exit 1 mkdir -p %{buildroot}/bin - mkdir -p %{buildroot}/usr/bin - mkdir -p %{buildroot}/usr/include/ast + mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}/%{_lib}/ast/bin + mkdir -p %{buildroot}%{_includedir}/ast mkdir -p %{buildroot}%{_libdir}/ast mkdir -p %{buildroot}%{_mandir} mkdir %{buildroot}%{_mandir}/man1 @@ -195,24 +197,24 @@ install bin/shcomp %{buildroot}/%{_lib}/ast/bin/ # install bin/suid_exec %{buildroot}/%{_lib}/ast/bin/ ln -sf /bin/true %{buildroot}/bin/ksh - ln -sf /bin/true %{buildroot}/usr/bin/ksh - ln -sf /%{_lib}/ast/bin/ksh %{buildroot}/usr/bin/rksh - ln -sf /%{_lib}/ast/bin/shcomp %{buildroot}/usr/bin/shcomp + ln -sf /bin/true %{buildroot}%{_bindir}/ksh + ln -sf /%{_lib}/ast/bin/ksh %{buildroot}%{_bindir}/rksh + ln -sf /%{_lib}/ast/bin/shcomp %{buildroot}%{_bindir}/shcomp cp -a lib/*.so.* %{buildroot}/%{_lib}/ast/ for so in %{buildroot}/%{_lib}/ast/*.so.*.* ; do so=${so##*/} ln -sf /%{_lib}/ast/$so %{buildroot}%{_libdir}/ast/${so%%%%.*}.so done rm -f %{buildroot}%{_libdir}/ast/*.so.* - install lib/*.a %{buildroot}%{_libdir}/ast/ - install -m644 man/man1/sh.1 %{buildroot}%{_mandir}/man1/ksh.1 - install -m644 man/man1/shcomp.1 %{buildroot}%{_mandir}/man1/shcomp.1 + install -m 0644 lib/*.a %{buildroot}%{_libdir}/ast/ + install -m 0644 man/man1/sh.1 %{buildroot}%{_mandir}/man1/ksh.1 + install -m 0644 man/man1/shcomp.1 %{buildroot}%{_mandir}/man1/shcomp.1 for man in man/man3/*.3 ; do man=${man##*/} ast=${man}ast - install -m644 man/man3/${man} %{buildroot}%{_mandir}/man3/${ast} + install -m 0644 man/man3/${man} %{buildroot}%{_mandir}/man3/${ast} done - install include/ast/* %{buildroot}/usr/include/ast/ + install -m 0644 include/ast/* %{buildroot}%{_includedir}/ast/ popd cp lib/package/LICENSES/ast LICENSE mv src/cmd/ksh93/OBSOLETE src/cmd/ksh93/OBSOLETE.mm @@ -256,9 +258,9 @@ %doc Builtins PROMO OBSOLETE MEMORANDUM %doc %{_mandir}/man1/*.1.gz %ghost %verify(not link) /bin/ksh -%ghost %verify(not link) /usr/bin/ksh -/usr/bin/rksh -/usr/bin/shcomp +%ghost %verify(not link) %{_bindir}/ksh +%{_bindir}/rksh +%{_bindir}/shcomp %dir /%{_lib}/ast %dir /%{_lib}/ast/bin /%{_lib}/ast/bin/ksh @@ -273,9 +275,11 @@ %{_libdir}/ast/*.so %{_libdir}/ast/*.a %doc %{_mandir}/man3/* -/usr/include/ast/ +%{_includedir}/ast/ %changelog +* Fri May 25 2007 - werner(a)suse.de +- Minor issuse like file permissions * Wed Apr 04 2007 - werner(a)suse.de - Minor correction for builtin uname -i * Mon Apr 02 2007 - werner(a)suse.de ++++++ workaround-stupid-build-system.diff ++++++ --- /var/tmp/diff_new_pack.c10730/_old 2007-05-25 17:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.c10730/_new 2007-05-25 17:26:40.000000000 +0200 @@ -114,6 +114,15 @@ done fastfind.o generated make hashalloc.o make hash/hashalloc.c +@@ -913,7 +913,7 @@ make lcgen + make port/lcgen.c + prev std/stdio.h implicit + done port/lcgen.c +-exec - ${CC} -o lcgen port/lcgen.c ++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o lcgen port/lcgen.c + done lcgen generated + make port/lc.tab + done port/lc.tab @@ -1458,7 +1458,7 @@ done sfio/sfhdr.h done port/mc.c meta mc.o %.c>%.o port/mc.c mc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim3
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package kdepim3 checked in at Fri May 25 17:26:20 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-05-22 15:54:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-05-25 13:20:14.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 25 13:19:44 CEST 2007 - dmueller(a)suse.de + +- split off -devel package + +------------------------------------------------------------------- New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.Pe6048/_old 2007-05-25 17:25:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Pe6048/_new 2007-05-25 17:25:37.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.7 -Release: 1 +Release: 2 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -300,12 +300,12 @@ /opt/kde3/%_lib/kde3/libkorg* /opt/kde3/%_lib/kde3/libkontact_korganizerplugin* /opt/kde3/%_lib/kde3/kcm_korgsummary.* -/opt/kde3/%_lib/libkorganizer.* -/opt/kde3/%_lib/libkorganizer_eventviewer.* -/opt/kde3/%_lib/libkorganizer_calendar.* -/opt/kde3/%_lib/libkgroupwarebase.* -/opt/kde3/%_lib/libkgroupwaredav.* -/opt/kde3/%_lib/libgwsoap* +/opt/kde3/%_lib/libkorganizer.so.* +/opt/kde3/%_lib/libkorganizer_eventviewer.so.* +/opt/kde3/%_lib/libkorganizer_calendar.so.* +/opt/kde3/%_lib/libkgroupwarebase.so.* +/opt/kde3/%_lib/libkgroupwaredav.so.* +/opt/kde3/%_lib/libgwsoap.so* /opt/kde3/%_lib/kde3/kcal_* /opt/kde3/%_lib/kde3/kcm_kab* /opt/kde3/%_lib/kde3/kcm_kontact.* @@ -344,38 +344,38 @@ /opt/kde3/%_lib/kde3/libkontact_specialdatesplugin.* /opt/kde3/%_lib/kde3/libkontact_journalplugin.* /opt/kde3/%_lib/libakregatorprivate.* -/opt/kde3/%_lib/libkabckolab.* +/opt/kde3/%_lib/libkabckolab.so.* /opt/kde3/%_lib/libkcalkolab.* -/opt/kde3/%_lib/libkholidays.* -/opt/kde3/%_lib/libkmime.* -/opt/kde3/%_lib/libkocorehelper.* -/opt/kde3/%_lib/libkode.* -/opt/kde3/%_lib/libkorg_stdprinting.* -/opt/kde3/%_lib/libkpgp.* -/opt/kde3/%_lib/libkslox.* -/opt/kde3/%_lib/libkabinterfaces.* -/opt/kde3/%_lib/libkaddressbook.* -/opt/kde3/%_lib/libkabc_* -/opt/kde3/%_lib/libkcal.* -/opt/kde3/%_lib/libkcal_* -/opt/kde3/%_lib/libkd* -/opt/kde3/%_lib/libkgantt.* -/opt/kde3/%_lib/libkontact.* -/opt/kde3/%_lib/libknotes* -/opt/kde3/%_lib/libkpimexchange.* -/opt/kde3/%_lib/libkpinterfaces.* -/opt/kde3/%_lib/libksieve.* -/opt/kde3/%_lib/libktnef.* -/opt/kde3/%_lib/libmimelib.* +/opt/kde3/%_lib/libkholidays.so.* +/opt/kde3/%_lib/libkmime.so.* +/opt/kde3/%_lib/libkocorehelper.so.* +/opt/kde3/%_lib/libkode.so.* +/opt/kde3/%_lib/libkorg_stdprinting.so.* +/opt/kde3/%_lib/libkpgp.so.* +/opt/kde3/%_lib/libkslox.so.* +/opt/kde3/%_lib/libkabinterfaces.so.* +/opt/kde3/%_lib/libkaddressbook.so.* +/opt/kde3/%_lib/libkabc_*.so.* +/opt/kde3/%_lib/libkcal.so.* +/opt/kde3/%_lib/libkcal_*.so* +/opt/kde3/%_lib/libkdepim.so.* +/opt/kde3/%_lib/libkgantt.so.* +/opt/kde3/%_lib/libkontact.so.* +/opt/kde3/%_lib/libknotes*.so.* +/opt/kde3/%_lib/libkpimexchange.so.* +/opt/kde3/%_lib/libkpinterfaces.so.* +/opt/kde3/%_lib/libksieve.so.* +/opt/kde3/%_lib/libktnef.so.* +/opt/kde3/%_lib/libmimelib.so.* /opt/kde3/%_lib/libkmailprivate.* -/opt/kde3/%_lib/libconnectionmanager.* -/opt/kde3/%_lib/libkpimidentities.* -/opt/kde3/%_lib/libgpgme* -/opt/kde3/%_lib/libqgpgme.* -/opt/kde3/%_lib/libkleopatra* +/opt/kde3/%_lib/libconnectionmanager.so.* +/opt/kde3/%_lib/libkpimidentities.so.* +/opt/kde3/%_lib/libgpgme++.so.* +/opt/kde3/%_lib/libqgpgme.so.* +/opt/kde3/%_lib/libkleopatra.so.* /opt/kde3/%_lib/libknodecommon* #/opt/kde3/%_lib/libkonnector.* -/opt/kde3/%_lib/libindex.* +/opt/kde3/%_lib/libindex.so.* /opt/kde3/%_lib/kde3/libakregatorpart.* /opt/kde3/%_lib/kde3/libkontact_akregator.* /opt/kde3/%_lib/kde3/kabc_* @@ -576,7 +576,7 @@ %defattr(-,root,root) /opt/kde3/bin/networkstatustestservice /opt/kde3/%_lib/kde3/kded_networkstatus.* -/opt/kde3/%_lib/libnetworkstatus.* +/opt/kde3/%_lib/libnetworkstatus.so.* /opt/kde3/share/services/kded/networkstatus.desktop %files mobile @@ -596,7 +596,7 @@ /opt/kde3/%_lib/kde3/conduit_* /opt/kde3/%_lib/kde3/libkontact_kpilotplugin* /opt/kde3/%_lib/kde3/kcm_kpilot.* -/opt/kde3/%_lib/libkpilot.* +/opt/kde3/%_lib/libkpilot.so.* /opt/kde3/share/applications/kde/kp* /opt/kde3/share/apps/kpilot /opt/kde3/share/icons/*/*x*/*/kpalmdoc.png @@ -667,8 +667,96 @@ /opt/kde3/%_lib/kde3/plugins/designer/kdepimwidgets.* /opt/kde3/include/* /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* +/opt/kde3/%_lib/libconnectionmanager.la +/opt/kde3/%_lib/libconnectionmanager.so +/opt/kde3/%_lib/libgpgme++.la +/opt/kde3/%_lib/libgpgme++.so +/opt/kde3/%_lib/libgwsoap.la +/opt/kde3/%_lib/libindex.la +/opt/kde3/%_lib/libindex.so +/opt/kde3/%_lib/libkabc_groupdav.la +/opt/kde3/%_lib/libkabc_groupdav.so +/opt/kde3/%_lib/libkabc_groupwise.la +/opt/kde3/%_lib/libkabc_groupwise.so +/opt/kde3/%_lib/libkcal_newexchange.la +/opt/kde3/%_lib/libkcal_resourcefeatureplan.la +/opt/kde3/%_lib/libkcal_resourceremote.la +/opt/kde3/%_lib/libkcal_slox.la +/opt/kde3/%_lib/libkcal_xmlrpc.la +/opt/kde3/%_lib/libkdepim.la +/opt/kde3/%_lib/libkdepim.so +/opt/kde3/%_lib/libkgantt.la +/opt/kde3/%_lib/libkgantt.so +/opt/kde3/%_lib/libkgroupwarebase.la +/opt/kde3/%_lib/libkgroupwarebase.so +/opt/kde3/%_lib/libkgroupwaredav.la +/opt/kde3/%_lib/libkgroupwaredav.so +/opt/kde3/%_lib/libkholidays.la +/opt/kde3/%_lib/libkholidays.so +/opt/kde3/%_lib/libkleopatra.la +/opt/kde3/%_lib/libkleopatra.so +/opt/kde3/%_lib/libkmime.la +/opt/kde3/%_lib/libkmime.so +/opt/kde3/%_lib/libknotes_xmlrpc.la +/opt/kde3/%_lib/libknotes_xmlrpc.so +/opt/kde3/%_lib/libknoteskolab.la +/opt/kde3/%_lib/libknoteskolab.so +/opt/kde3/%_lib/libkocorehelper.la +/opt/kde3/%_lib/libkocorehelper.so +/opt/kde3/%_lib/libkode.la +/opt/kde3/%_lib/libkode.so +/opt/kde3/%_lib/libkontact.la +/opt/kde3/%_lib/libkontact.so +/opt/kde3/%_lib/libkorg_stdprinting.la +/opt/kde3/%_lib/libkorg_stdprinting.so +/opt/kde3/%_lib/libkorganizer.la +/opt/kde3/%_lib/libkorganizer.so +/opt/kde3/%_lib/libkorganizer_calendar.la +/opt/kde3/%_lib/libkorganizer_calendar.so +/opt/kde3/%_lib/libkorganizer_eventviewer.la +/opt/kde3/%_lib/libkorganizer_eventviewer.so +/opt/kde3/%_lib/libkpgp.la +/opt/kde3/%_lib/libkpgp.so +/opt/kde3/%_lib/libkpimexchange.la +/opt/kde3/%_lib/libkpimexchange.so +/opt/kde3/%_lib/libkpimidentities.la +/opt/kde3/%_lib/libkpimidentities.so +/opt/kde3/%_lib/libkpinterfaces.la +/opt/kde3/%_lib/libkpinterfaces.so +/opt/kde3/%_lib/libksieve.la +/opt/kde3/%_lib/libksieve.so +/opt/kde3/%_lib/libkslox.la +/opt/kde3/%_lib/libkslox.so +/opt/kde3/%_lib/libktnef.la +/opt/kde3/%_lib/libktnef.so +/opt/kde3/%_lib/libmimelib.la +/opt/kde3/%_lib/libmimelib.so +/opt/kde3/%_lib/libqgpgme.la +/opt/kde3/%_lib/libqgpgme.so +/opt/kde3/%_lib/libkabc_newexchange.la +/opt/kde3/%_lib/libkabc_newexchange.so +/opt/kde3/%_lib/libkabc_slox.la +/opt/kde3/%_lib/libkabc_slox.so +/opt/kde3/%_lib/libkabc_xmlrpc.la +/opt/kde3/%_lib/libkabc_xmlrpc.so +/opt/kde3/%_lib/libkabckolab.la +/opt/kde3/%_lib/libkabckolab.so +/opt/kde3/%_lib/libkabinterfaces.la +/opt/kde3/%_lib/libkabinterfaces.so +/opt/kde3/%_lib/libkaddressbook.la +/opt/kde3/%_lib/libkaddressbook.so +/opt/kde3/%_lib/libkcal.la +/opt/kde3/%_lib/libkcal.so +/opt/kde3/%_lib/libkcal_groupdav.la +/opt/kde3/%_lib/libkcal_groupwise.la +/opt/kde3/%_lib/libnetworkstatus.so +/opt/kde3/%_lib/libnetworkstatus.la +/opt/kde3/%_lib/libkpilot.la +/opt/kde3/%_lib/libkpilot.so %changelog +* Fri May 25 2007 - dmueller(a)suse.de +- split off -devel package * Mon May 21 2007 - stbinner(a)suse.de - update to 3.5.7: * KAddressbook: Add support to search in custom fields. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcsc-acr38
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package pcsc-acr38 checked in at Fri May 25 17:25:14 CEST 2007. -------- --- pcsc-acr38/pcsc-acr38.changes 2006-11-27 12:00:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/pcsc-acr38/pcsc-acr38.changes 2007-05-25 11:53:29.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 25 11:53:16 CEST 2007 - sbrabec(a)suse.cz + +- Updated to version 1.7.9: + * Fixed an error in the target location of libacr38ucontrol.pc + * Mac only release that includes Universal Binary + * Issue PPS in a loop to handle the case when PTS1=0x95 for + older ACR38 +- Fixes unplug-replug without restarting pcscd (#259973). +- Added devel subpackage. +- Use classic versioning schema (used in upstream ChangeLog). + +------------------------------------------------------------------- Old: ---- ACR38_LINUX_100705_P-destdir.diff ACR38_LINUX_100705_P.tar.bz2 New: ---- ACR38_LINUX_100709-automake-cleanup.patch ACR38_LINUX_100709_P.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-acr38.spec ++++++ --- /var/tmp/diff_new_pack.Kb4938/_old 2007-05-25 17:25:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Kb4938/_new 2007-05-25 17:25:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pcsc-acr38 (Version 100705_P) +# spec file for package pcsc-acr38 (Version 1.7.9) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,20 +11,21 @@ # norootforbuild Name: pcsc-acr38 -BuildRequires: pcsc-lite-devel pkgconfig -Version: 100705_P -Release: 36 +BuildRequires: pcsc-lite-devel pkg-config +Version: 1.7.9 +Release: 1 +%define _version 100709_P Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries -License: GNU General Public License (GPL), Other License(s), see package +License: GNU General Public License (GPL) URL: http://www.linuxnet.com/ Summary: PC/SC IFD Handler for the ACR38 Smart Card Reader -Source0: ACR38_LINUX_%{version}.tar.bz2 -Patch0: ACR38_LINUX_%{version}-destdir.diff -Patch1: ACR38_LINUX_%{version}-ucread.diff -Patch2: ACR38_LINUX_%{version}-usb.diff +Source0: ACR38_LINUX_%{_version}.tar.bz2 +Patch1: ACR38_LINUX_100705_P-ucread.diff +Patch2: ACR38_LINUX_100705_P-usb.diff +Patch3: ACR38_LINUX_100709-automake-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define ifddir %{_libdir}/readers +%define ifddir %(pkg-config libpcsclite --variable=usbdropdir) %description This package contains a driver for the ACR 38 smart card reader @@ -38,38 +39,71 @@ David Corcoran <corcoran(a)linuxnet.com> Edward Cheung <edward.cheung(a)acs.com.hk> +%package devel +Group: System/Libraries +Summary: PC/SC IFD Handler for the ACR38 Smart Card Reader +Requires: %{name} = %{version} pcsc-lite-devel + +%description devel +This package contains a driver for the ACR 38 smart card reader +produced by ACS. This driver is meant to be used with the PCSC-Lite +daemon from the pcsc-lite package. + + + +Authors: +-------- + David Corcoran <corcoran(a)linuxnet.com> + Edward Cheung <edward.cheung(a)acs.com.hk> + %prep -%setup -q -n ACR38_LINUX_%{version} -%patch0 +%setup -q -n ACR38_LINUX_%{_version} %patch1 %patch2 +%patch3 %build -%{suse_update_config -f build} -aclocal --force -libtoolize --force -autoconf --force -autoheader --force -automake -afc -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --libdir=%{ifddir} \ - --enable-usbdropdir=%{ifddir} -make +autoreconf -f -i +%configure\ + --disable-static +make %{?jobs:-j%jobs} %install -install -d $RPM_BUILD_ROOT%{ifddir} -make -C src/driver install DESTDIR=$RPM_BUILD_ROOT +%makeinstall +rm $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{ifddir}/*/*/*/*.la %clean rm -rf $RPM_BUILD_ROOT +%post +%run_ldconfig + +%postun +%run_ldconfig + %files -%defattr(644,root,root,755) +%defattr(-,root,root) +# NEWS is empty %doc AUTHORS COPYING ChangeLog README -%{ifddir} +%{_libdir}/*.so.* +%{ifddir}/* -%changelog -n pcsc-acr38 +%files devel +%defattr(-,root,root) +%{_includedir}/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + +%changelog +* Fri May 25 2007 - sbrabec(a)suse.cz +- Updated to version 1.7.9: + * Fixed an error in the target location of libacr38ucontrol.pc + * Mac only release that includes Universal Binary + * Issue PPS in a loop to handle the case when PTS1=0x95 for + older ACR38 +- Fixes unplug-replug without restarting pcscd (#259973). +- Added devel subpackage. +- Use classic versioning schema (used in upstream ChangeLog). * Mon Nov 27 2006 - mjancar(a)suse.cz - use /dev/bus/usb instead of /proc/bus/usb (#223740) * Tue Nov 07 2006 - prusnak(a)suse.cz ++++++ ACR38_LINUX_100705_P-ucread.diff ++++++ --- /var/tmp/diff_new_pack.Kb4938/_old 2007-05-25 17:25:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Kb4938/_new 2007-05-25 17:25:07.000000000 +0200 @@ -1,3 +1,6 @@ +https://bugzilla.novell.com/show_bug.cgi?id=186108 +AdmHndlr.c(493): warning #175: subscript out of range +AdmHndlr.c(494): warning #175: subscript out of range --- src/driver/AdmHndlr.c +++ src/driver/AdmHndlr.c @@ -478,7 +478,7 @@ ++++++ ACR38_LINUX_100709-automake-cleanup.patch ++++++ --- configure.ac +++ configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([ACR38UDriver], [1.0.7.5], edward.cheung(a)acs.com.hk) +AC_INIT([ACR38UDriver], [1.7.9], edward.cheung(a)acs.com.hk) AC_CONFIG_SRCDIR([src/driver/AdmHndlr.c]) AC_CONFIG_AUX_DIR(build) AC_CONFIG_HEADER([config.h]) @@ -73,23 +73,8 @@ fi fi -# removed by ZETES -# AC_SUBST([PKG_PCSC_CONFIG_PATH],[$pcscdropdir/lib/pkgconfig]) -# removed by ZETES -# AC_SUBST([PKG_PCSCLITE],[$pcscdropdir/lib/pkgconfig/libpcsclite.pc]) - -# added by ZETES ... -PKG_PCSCLITE="libpcsclite" -# ... added by ZETES - # Check if pkg-config exists -AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes]) -if test "$PKGCONFIG" = "yes"; then - if ! `pkg-config --print-errors --atleast-version=1.2.0 $PKG_PCSCLITE` - then - AC_MSG_ERROR([install pcsc-lite 1.2.0 or later]) - fi -fi +PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0]) # --enable-usbdropdir=DIR AC_ARG_ENABLE([usbdropdir], @@ -99,20 +84,8 @@ [usbdropdir=false]) if test "${usbdropdir}" = false ; then - if test "$PKGCONFIG" = yes ; then - usbdropdir=`pkg-config $PKG_PCSCLITE --variable=usbdropdir` - else - usbdropdir="" - fi - if test -z "$usbdropdir" ; then - if test "$prefix" = NONE ; then - usbdropdir="$ac_default_prefix/pcsc/drivers" - else - usbdropdir="$prefix/pcsc/drivers" - fi - fi + usbdropdir=`$PKG_CONFIG libpcsclite --variable=usbdropdir` fi - AC_SUBST(usbdropdir) AC_MSG_RESULT([USB drop directory : $usbdropdir]) @@ -134,38 +107,11 @@ AC_PROG_CC AC_PROG_LIBTOOL -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lpcsclite': -#AC_CHECK_LIB([pcsclite], [main]) -# FIXME: Replace `main' with a function in `-lpthread': -#AC_CHECK_LIB([pthread], [main]) - # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h limits.h malloc.h memory.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h]) -# Test if pcsclite-1.2.9betaX is installed -#if test -d $pcsclite_inc/PCSC; then -# echo "PCSCLITE-1.2.9 or above is installed" -# pcsclite_inc="$pcsclite_inc/PCSC" -#else -# echo "PCSCLITE-1.2.0 is installed" -#fi - -# Setup the compiler and linker flag -OLD_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`" - -# Check for pcsclite header files -# removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!" -# removed by ZETES AC_CHECK_HEADER([pcsclite.h],,[AC_MSG_ERROR([$NO_PCSC_MSG])],[#include <pcsclite.h>]) - -# removed by ZETES CFLAGS=$OLD_CFLAGS - -AC_SUBST(LIBPCSCLITE) -LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE` - # Select OS specific versions of source files. AC_SUBST(BUNDLE_HOST) AC_SUBST(DYN_LIB_EXT) --- src/controllib/Makefile.am +++ src/controllib/Makefile.am @@ -4,9 +4,7 @@ # # Process this file with automake to produce a Makefile.in script. -ACR38_CONTROLLIB = libacr38ucontrol.$(DYN_LIB_EXT) - -AM_CPPFLAGS = -I../driver `pkg-config libpcsclite --cflags` +AM_CPPFLAGS = -I $(top_srcdir)/src/driver $(PCSCLITE_CFLAGS) lib_LTLIBRARIES = libacr38ucontrol.la include_HEADERS = ACS38DrvTools.h @@ -16,8 +14,6 @@ ACS38DrvTools.h libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB) -libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags` -#pcdir= $(PKG_PCSC_CONFIG_PATH) -pcdir= @prefix@/lib/pkgconfig -pc_DATA = libacr38ucontrol.pc +pkgconfigdir= $(libdir)/pkgconfig +pkgconfig_DATA = libacr38ucontrol.pc --- src/driver/Makefile.am +++ src/driver/Makefile.am @@ -5,15 +5,18 @@ # Process this file with automake to produce a Makefile.in script. DRIVER_NAME = ACR38UDriver -DRIVER_LIB_NAME = lib$(DRIVER_NAME).$(DYN_LIB_EXT) DRIVER_BUNDLE_DIR = $(DRIVER_NAME).bundle -DRIVER_INSTALL_HOME_DIR = pcsc/drivers/$(DRIVER_LIB_NAME).bundle/Contents/Linux -AM_CPPFLAGS = `pkg-config libpcsclite --cflags` +driverdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST) EXTRA_DIST = Info.plist -lib_LTLIBRARIES = libACR38UDriver.la +AM_CPPFLAGS = $(PCSCLITE_CFLAGS) + +plistdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents +plist_DATA=Info.plist + +driver_LTLIBRARIES = libACR38UDriver.la SRC_DRV = ACR38IOCtrl.h \ AdmHndlr.c \ @@ -21,6 +24,7 @@ ctapi.h \ MCU_ATR.c \ SysConfig.c \ + SysConfig.h \ usbserial_linux.c \ usbserial_linux.h \ AdmHndlr.h \ @@ -38,13 +42,4 @@ usblinux.h libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB) -libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @COREFOUNDATION@ @IOKIT@ - -install: libACR38UDriver.la - $(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/ - $(INSTALL) .libs/$(DRIVER_LIB_NAME) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME) - $(INSTALL) Info.plist $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents -# chmod 755 $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME) - -uninstall: - rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR) +libACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT) ++++++ ACR38_LINUX_100705_P.tar.bz2 -> ACR38_LINUX_100709_P.tar.bz2 ++++++ ++++ 3308 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit FlightGear
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package FlightGear checked in at Fri May 25 17:24:59 CEST 2007. -------- --- FlightGear/FlightGear.changes 2007-02-14 17:08:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/FlightGear/FlightGear.changes 2007-05-25 16:47:11.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 25 16:44:54 CEST 2007 - lmichnovic(a)suse.cz + +- added renamed package plib-devel for BuildReq +- removing header files +- added upstream paatches: + * flightgear.plib-dependencies.patch + * simgear.plib-dependencies.patch -> make -j can be used again + * flightgear.plib-glut-SDL.patch + * simgear.plib-distclean.patch +- fixed PPC CPU detection (ppc_detect.patch) + +------------------------------------------------------------------- +Wed May 16 17:30:07 CEST 2007 - lmichnovic(a)suse.cz + +- update to version 0.9.11-pre1 +- updated SimGear*uninitialized.patch +- specifying x-libs and x-headers + +------------------------------------------------------------------- Old: ---- FlightGear-0.9.10-aoverflow.patch FlightGear-0.9.10.tar.bz2 SimGear-0.3.10-strict_alias.patch SimGear-0.3.10.tar.bz2 SimGear-0.3.10-uninitialized.patch New: ---- FlightGear-0.9.10-array_overflow.patch FlightGear-0.9.11-pre1.tar.bz2 flightgear.plib-dependencies.patch flightgear.plib-glut-SDL.patch SimGear-0.3.11-pre1-ppc_detect.patch SimGear-0.3.11-pre1-strict_alias.patch SimGear-0.3.11-pre1.tar.bz2 SimGear-0.3.11-pre1-uninitialized.patch simgear.plib-dependencies.patch simgear.plib-distclean.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FlightGear.spec ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package FlightGear (Version 0.9.10) +# spec file for package FlightGear (Version 0.9.10.9.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,26 +11,42 @@ # norootforbuild Name: FlightGear -BuildRequires: freealut-devel freeglut-devel gcc-c++ libdrm-devel openal-devel plib update-desktop-files xorg-x11 +%if %suse_version < 1010 +BuildRequires: freeglut-devel gcc-c++ openal-devel plib update-desktop-files xorg-x11 +%else +BuildRequires: freeglut-devel gcc-c++ libdrm-devel openal-devel plib update-desktop-files xorg-x11 +%endif +%if %suse_version > 1020 +BuildRequires: plib-devel +%endif +# openal is splitted in 10.2 into openal and freealut. +%if %suse_version > 1010 +BuildRequires: freealut-devel +%endif License: GNU General Public License (GPL) Group: Amusements/Games/3D/Simulation Autoreqprov: on -Version: 0.9.10 -Release: 43 +Version: 0.9.10.9.1 +Release: 1 Provides: flightgr Obsoletes: flightgr PreReq: /bin/ln Summary: FlightGear Flight Simulator URL: http://www.flightgear.org/ -Source: %{name}-%{version}.tar.bz2 -%define simgear SimGear-0.3.10 +Source: %{name}-0.9.11-pre1.tar.bz2 +%define simgear SimGear-0.3.11-pre1 Source1: %{simgear}.tar.bz2 Patch1: %{name}-0.9.10-browser.patch Patch2: %{name}-0.9.10-64bit.patch Patch3: %{name}-0.9.10-test.patch -Patch4: %{name}-0.9.10-aoverflow.patch +Patch4: %{name}-0.9.10-array_overflow.patch +Patch5: flightgear.plib-dependencies.patch +Patch6: flightgear.plib-glut-SDL.patch Patch10: %{simgear}-uninitialized.patch Patch11: %{simgear}-strict_alias.patch +Patch12: simgear.plib-dependencies.patch +Patch13: simgear.plib-distclean.patch +Patch14: SimGear-0.3.11-pre1-ppc_detect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: FlightGear-data = %version @@ -101,15 +117,20 @@ %if %suse_version < 1000 exit 1 %endif -%setup -q -b 1 +%setup -n FlightGear-0.9.11-pre1 -q -b 1 pushd ../%{simgear} %patch10 %patch11 +%patch12 -p1 +%patch13 -p1 +%patch14 popd %patch1 %patch2 %patch3 %patch4 +%patch5 -p1 +%patch6 -p1 rm -fv docs-mini/FlightGear-FAQ.html.~1.3.~ %build @@ -117,8 +138,15 @@ mkdir /var/tmp/tmpinstall export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# beware where is the X libraries installed (X.org 6.9 vs. 7.x) +%if "%(xft-config --prefix)" == "/usr" +CONFIGURE_OPTIONS="--prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \ +--infodir=%{_infodir} --sysconfdir=%{_sysconfdir} --without-logging \ +--x-includes=/usr/include --x-libraries=/usr/%{_lib}" +%else CONFIGURE_OPTIONS="--prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \ --infodir=%{_infodir} --sysconfdir=%{_sysconfdir} --without-logging" +%endif # # SimGear build and install # don't use make %{?jobs:-j%jobs}, fails on some archs everytime @@ -128,20 +156,27 @@ autoreconf --force --install CPPFLAGS="-I /var/tmp/tmpinstall/%{_includedir}" ./configure $CONFIGURE_OPTIONS \ LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} -make +make %{?jobs:-j%jobs} make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=/var/tmp/tmpinstall install -cd ../%{name}-%{version} +cd ../%{name}-0.9.11-pre1 # # FlightGear finally # don't use make %{?jobs:-j%jobs}, fails sometimes on every archs. # autoreconf --force --install %{?suse_update_config:%{suse_update_config -f}} +# beware where is the X libraries installed (X.org 6.9 vs. 7.x) +%if "%(xft-config --prefix)" == "/usr" +./configure $CONFIGURE_OPTIONS --with-x --with-simgear=/var/tmp/tmpinstall/usr \ + LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} \ + --x-includes=/usr/include --x-libraries=/usr/%{_lib} +%else ./configure $CONFIGURE_OPTIONS --with-x --with-simgear=/var/tmp/tmpinstall/usr \ LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} -make -# use sdl instead of glut if some problems to run FG +%endif +make %{?jobs:-j%jobs} +# use sdl instead of glut if some problems to run FG, no need to do so now, freeglut is fixed in Suse # --enable-sdl %install @@ -161,8 +196,24 @@ /usr/include/* /usr/%{_lib}/lib* /usr/share/applications/%name.desktop - -%changelog -n FlightGear +%exclude /usr/%{_lib}/*.a +%exclude /usr/include/simgear/*.h +%exclude /usr/include/simgear/*/*.h + +%changelog +* Fri May 25 2007 - lmichnovic(a)suse.cz +- added renamed package plib-devel for BuildReq +- removing header files +- added upstream paatches: + * flightgear.plib-dependencies.patch + * simgear.plib-dependencies.patch -> make -j can be used again + * flightgear.plib-glut-SDL.patch + * simgear.plib-distclean.patch +- fixed PPC CPU detection (ppc_detect.patch) +* Wed May 16 2007 - lmichnovic(a)suse.cz +- update to version 0.9.11-pre1 +- updated SimGear*uninitialized.patch +- specifying x-libs and x-headers * Wed Feb 14 2007 - mvaner(a)suse.cz - Fixed array overflow, #242362 (aoverflow.patch) * Tue Oct 24 2006 - ro(a)suse.de ++++++ FlightGear-0.9.10-64bit.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:54.000000000 +0200 @@ -1,6 +1,6 @@ ---- src/Scripting/NasalSys.cxx 2005-04-28 17:45:29.000000000 +0200 -+++ src/Scripting/NasalSys.cxx 2005-04-28 17:45:44.000000000 +0200 -@@ -86,7 +86,7 @@ +--- src/Scripting/NasalSys.cxx ++++ src/Scripting/NasalSys.cxx +@@ -117,7 +117,7 @@ char buf[256]; if(!name) { ++++++ FlightGear-0.9.10-array_overflow.patch ++++++ --- src/FDM/JSBSim/models/FGFCS.cpp +++ src/FDM/JSBSim/models/FGFCS.cpp @@ -77,7 +77,7 @@ LeftBrake = RightBrake = CenterBrake = 0.0; bind(); - for (i=0;i<=NForms;i++) { + for (i=0;i<NForms;i++) { DePos[i] = DaLPos[i] = DaRPos[i] = DrPos[i] = 0.0; DfPos[i] = DsbPos[i] = DspPos[i] = 0.0; } ++++++ FlightGear-0.9.10-browser.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:55.000000000 +0200 @@ -11,7 +11,7 @@ echo "You need to upgrade to automake version 1.5 or greater." --- src/GUI/gui_funcs.cxx +++ src/GUI/gui_funcs.cxx -@@ -222,6 +222,8 @@ +@@ -183,6 +183,8 @@ void helpCb (puObject *) { string command; @@ -20,7 +20,7 @@ #if defined(FX) && !defined(WIN32) # if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW) -@@ -239,11 +241,18 @@ +@@ -200,11 +202,18 @@ string help_app = fgGetString("/sim/startup/browser-app"); @@ -41,7 +41,7 @@ command += " &"; system( command.c_str() ); -@@ -264,8 +273,13 @@ +@@ -225,8 +234,13 @@ SW_SHOWNORMAL ) ; #endif ++++++ FlightGear-0.9.10-test.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:55.000000000 +0200 @@ -2,10 +2,10 @@ +++ tests/test-text.cxx @@ -4,7 +4,7 @@ #include <string.h> - + static void readchars( FILE *fd ) { - char c; + int c; while ( (c = fgetc(fd)) != EOF ) { - printf("c = %d", c); - if ( c == 10 ) { + printf("c = %d", c); + if ( c == 10 ) { ++++++ flightgear.plib-dependencies.patch ++++++ commit f2949dca7ae2b6264184ad256ff33b67e5c087c8 Author: Pigeon <pigeon(a)pigeond.net> Date: Tue May 15 22:24:25 2007 +1000 src/Main/Makefile.am dependencies fix diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 5ac0cf0..fdc5809 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -60,7 +60,7 @@ libMain_a_SOURCES = \ fgfs_SOURCES = bootstrap.cxx fgfs_LDADD = \ - $(top_builddir)/src/Main/libMain.a \ + libMain.a \ $(top_builddir)/src/Aircraft/libAircraft.a \ $(top_builddir)/src/ATC/libATC.a \ $(top_builddir)/src/Cockpit/libCockpit.a \ ++++++ flightgear.plib-glut-SDL.patch ++++++ commit 43eb8463a884e68c19aa3ac1c71adc6dd7a16ea7 Author: Pigeon <pigeon(a)pigeond.net> Date: Fri May 18 21:23:40 2007 +1000 Not linking against glut when using SDL. diff --git a/configure.ac b/configure.ac index 0548591..1fe08f3 100644 --- a/configure.ac +++ b/configure.ac @@ -265,9 +265,10 @@ case "${host}" in fi AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ]) - AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) if test "x$enable_sdl" = "xyes"; then AC_SEARCH_LIBS(SDL_Init, SDL) + else + AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) fi ;; diff --git a/tests/gl-info.c b/tests/gl-info.c index 4aff41d..1410b7b 100644 --- a/tests/gl-info.c +++ b/tests/gl-info.c @@ -20,7 +20,14 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800 #include <simgear/compiler.h> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif void getPrints ( GLenum token, char *string ) @@ -58,9 +65,16 @@ void getPrinti ( GLenum token, char *string ) int main ( int argc, char **argv ) { +#if defined(PU_USE_GLUT) glutInit ( &argc, argv ) ; glutInitDisplayMode ( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ) ; glutCreateWindow ( "You should never see this window!" ) ; +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + atexit(SDL_Quit); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(320, 240, 0, SDL_OPENGL); +#endif getPrints ( GL_VENDOR , "GL_VENDOR" ) ; getPrints ( GL_RENDERER , "GL_RENDERER" ) ; diff --git a/tests/test-env-map.cxx b/tests/test-env-map.cxx index 6d369ef..3c9ed0c 100644 --- a/tests/test-env-map.cxx +++ b/tests/test-env-map.cxx @@ -12,7 +12,15 @@ #include <simgear/compiler.h> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#include <GL/glu.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif #define TEXRES_X 256 #define TEXRES_Y 256 @@ -23,6 +31,10 @@ GLuint texName; int window_x = 640, window_y = 480; float alpha = 0.0, beta = 0.0; +#if defined(PU_USE_SDL) +static bool NeedRedraw = false; +#endif + /*****************************************************************/ /*****************************************************************/ /*****************************************************************/ @@ -207,8 +219,12 @@ void display() glFlush(); glDisable(GL_TEXTURE_2D); +#if defined(PU_USE_GLUT) glutPostRedisplay () ; glutSwapBuffers () ; +#elif defined(PU_USE_SDL) + NeedRedraw = true; +#endif } void keyboard (unsigned char key, int x, int y) @@ -244,18 +260,63 @@ void keyboard (unsigned char key, int x, int y) } } +#if defined(PU_USE_SDL) +void sdlMainLoop() +{ + display(); + while(1) { + SDL_Event e; + int key; + while(SDL_PollEvent(&e)) { + switch(e.type) { + case SDL_QUIT: + break; + case SDL_KEYDOWN: + key = e.key.keysym.sym; + keyboard(key, 0, 0); + display (); + break; + case SDL_VIDEORESIZE: + SDL_SetVideoMode(e.resize.w, e.resize.h, 0, SDL_OPENGL|SDL_RESIZABLE); + reshape(e.resize.w, e.resize.h); + break; + case SDL_VIDEOEXPOSE: + display (); + break; + } + } + if(NeedRedraw) { + SDL_GL_SwapBuffers (); + } + } +} +#endif + int main(int argc, char** argv) { +#if defined(PU_USE_GLUT) glutInitWindowSize(window_x, window_y); glutInit(&argc, argv); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); glutCreateWindow(argv[0]); +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(window_x, window_y, 0, SDL_OPENGL|SDL_RESIZABLE); + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); +#endif + init(); + +#if defined(PU_USE_GLUT) glutDisplayFunc(display); glutReshapeFunc(reshape); glutKeyboardFunc(keyboard); - glutMainLoop(); +#elif defined(PU_USE_SDL) + sdlMainLoop(); +#endif + return 0; } diff --git a/utils/Modeller/3dconvert.cxx b/utils/Modeller/3dconvert.cxx index db9859e..eacf69c 100644 --- a/utils/Modeller/3dconvert.cxx +++ b/utils/Modeller/3dconvert.cxx @@ -6,7 +6,14 @@ #include <iostream> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif #include <plib/ssg.h> @@ -22,12 +29,19 @@ main (int ac, char ** av) return 1; } +#if defined(PU_USE_GLUT) int fakeac = 1; char * fakeav[] = { "3dconvert", "Convert a 3D Model", 0 }; glutInit(&fakeac, fakeav); glutCreateWindow(fakeav[1]); +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + atexit(SDL_Quit); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(320, 240, 0, SDL_OPENGL); +#endif ssgInit(); ssgEntity * object = ssgLoad(av[1]); ++++++ SimGear-0.3.11-pre1-ppc_detect.patch ++++++ --- simgear/nasal/naref.h +++ simgear/nasal/naref.h @@ -12,7 +12,7 @@ #elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \ defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) # define NASAL_LE -#elif defined(__sparc) || defined(__ppc__) || defined(__mips) || \ +#elif defined(__SPARC) || defined(__PPC__) || defined(__MIPS) || \ defined(__ARMEB__) # define NASAL_BE #else ++++++ SimGear-0.3.11-pre1-strict_alias.patch ++++++ --- simgear/nasal/hash.c +++ simgear/nasal/hash.c @@ -24,7 +24,7 @@ // Numbers get the number as a hash. Just use the bits and // xor them together. Note assumption that sizeof(double) >= // 2*sizeof(int). - unsigned int* p = (unsigned int*)&(r.num); + unsigned int* p = &(r.num); return p[0] ^ p[1]; } else if(PTR(r).str->hashcode) { return PTR(r).str->hashcode; ++++++ SimGear-0.3.11-pre1-uninitialized.patch ++++++ --- simgear/screen/RenderTexture.cpp +++ simgear/screen/RenderTexture.cpp @@ -622,7 +622,7 @@ _pDisplay = glXGetCurrentDisplay(); GLXContext context = glXGetCurrentContext(); int screen = DefaultScreen(_pDisplay); - XVisualInfo *visInfo; + XVisualInfo *visInfo = NULL; GLXFBConfig *fbConfigs; int nConfigs; --- simgear/sound/openal_test1.cxx +++ simgear/sound/openal_test1.cxx @@ -99,7 +99,7 @@ ALsizei size; ALvoid* data; ALsizei freq; - ALboolean loop; + ALboolean loop = 0; source_pos[0] = 0.0; source_pos[1] = 0.0; source_pos[2] = 0.0; source_vel[0] = 0.0; source_vel[1] = 0.0; source_vel[2] = 0.0; ++++++ simgear.plib-dependencies.patch ++++++ commit d0ea4d5f32f55c15d55e9e60c7b22a3945035cca Author: Pigeon <pigeon(a)pigeond.net> Date: Tue May 15 21:56:17 2007 +1000 Some dependencies fix with Makefile.am, so that make -j works diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am index d7149cf..f597465 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -27,7 +27,7 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client tcp_server_SOURCES = tcp_server.cxx tcp_server_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ + libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -38,7 +38,7 @@ tcp_server_LDADD = \ tcp_client_SOURCES = tcp_client.cxx tcp_client_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ + libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -49,7 +49,7 @@ tcp_client_LDADD = \ socktest_SOURCES = socktest.cxx socktest_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ + libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -60,7 +60,7 @@ socktest_LDADD = \ lowtest_SOURCES = lowtest.cxx lowtest_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ + libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -69,7 +69,7 @@ lowtest_LDADD = \ decode_binobj_SOURCES = decode_binobj.cxx decode_binobj_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ + libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am index 619e283..03aa978 100644 --- a/simgear/magvar/Makefile.am +++ b/simgear/magvar/Makefile.am @@ -13,7 +13,7 @@ noinst_PROGRAMS = testmagvar testmagvar_SOURCES = testmagvar.cxx testmagvar_LDADD = \ - $(top_builddir)/simgear/magvar/libsgmagvar.a \ + libsgmagvar.a \ $(base_LIBS) INCLUDES = -I$(top_srcdir) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index 4e9b64e..44221dd 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -26,7 +26,7 @@ noinst_PROGRAMS = tabbed_value_test swap_test tabbed_value_test_SOURCES = tabbed_values_test.cxx tabbed_value_test_LDADD = \ - $(top_builddir)/simgear/misc/libsgmisc.a \ + libsgmisc.a \ $(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/debug/libsgdebug.a diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am index 30265b6..f1cf6f9 100644 --- a/simgear/props/Makefile.am +++ b/simgear/props/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = props_test props_test_SOURCES = props_test.cxx props_test_LDADD = \ - $(top_builddir)/simgear/props/libsgprops.a \ + libsgprops.a \ $(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am index ead62da..d112265 100644 --- a/simgear/route/Makefile.am +++ b/simgear/route/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = waytest routetest waytest_SOURCES = waytest.cxx waytest_LDADD = \ - $(top_builddir)/simgear/route/libsgroute.a \ + libsgroute.a \ $(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -25,7 +25,7 @@ waytest_LDADD = \ routetest_SOURCES = routetest.cxx routetest_LDADD = \ - $(top_builddir)/simgear/route/libsgroute.a \ + libsgroute.a \ $(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(base_LIBS) diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am index 482bba6..11e5a1d 100644 --- a/simgear/screen/Makefile.am +++ b/simgear/screen/Makefile.am @@ -41,7 +41,7 @@ noinst_PROGRAMS = TestRenderTexture TestRenderTexture_SOURCES = TestRenderTexture.cpp TestRenderTexture_LDADD = \ - $(top_builddir)/simgear/screen/libsgscreen.a \ + libsgscreen.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(opengl_LIBS) endif diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am index 17af84e..0cace19 100644 --- a/simgear/serial/Makefile.am +++ b/simgear/serial/Makefile.am @@ -11,7 +11,7 @@ noinst_PROGRAMS = testserial testserial_SOURCES = testserial.cxx testserial_LDADD = \ - $(top_builddir)/simgear/serial/libsgserial.a \ + libsgserial.a \ $(top_builddir)/simgear/debug/libsgdebug.a INCLUDES = -I$(top_srcdir) diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am index 86aeebe..fc7e41f 100644 --- a/simgear/sound/Makefile.am +++ b/simgear/sound/Makefile.am @@ -26,7 +26,7 @@ openal_test1_LDADD = \ $(openal_LIBS) openal_test2_LDADD = \ - $(top_builddir)/simgear/sound/libsgsound.a \ + libsgsound.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/structure/libsgstructure.a \ ++++++ simgear.plib-distclean.patch ++++++ commit 39e75c73bff5712eb1e2e17dd0e55555a709a44e Author: Pigeon <pigeon(a)pigeond.net> Date: Tue May 15 18:35:27 2007 +1000 simgear/Makefile.am fix diff --git a/simgear/Makefile.am b/simgear/Makefile.am index 97b15b0..61d53f4 100644 --- a/simgear/Makefile.am +++ b/simgear/Makefile.am @@ -34,4 +34,4 @@ SUBDIRS = \ $(SGTHREAD_DIR) \ timing -DIST_SUBDIRS = $(SUBDIRS) compatibility threads +DIST_SUBDIRS = $(SUBDIRS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package yast2 checked in at Fri May 25 17:24:14 CEST 2007. -------- --- yast2/yast2.changes 2007-05-17 18:02:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-05-25 11:14:29.448642000 +0200 @@ -1,0 +2,20 @@ +Fri May 25 10:59:56 CEST 2007 - jsrain(a)suse.cz + +- fixed spec file (removed duplicate .desktop files translations) +- removed translations from .desktop-files (#271209) +- 2.15.34 + +------------------------------------------------------------------- +Mon May 21 16:04:31 CEST 2007 - kmachalkova(a)suse.cz + +- Do not show empty xmessage window if nothing is printed to stderr + after yast module has exited (mvidner's patch for #265263) + +------------------------------------------------------------------- +Mon May 21 13:39:58 CEST 2007 - jsrain(a)suse.cz + +- fixed chrp board detection (PPC) (#273606) +- do not check UI mode when enabling the 'Use LDAP' widget in + service dialog (#274649) + +------------------------------------------------------------------- Old: ---- yast2-2.15.33.tar.bz2 New: ---- yast2-2.15.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.z30551/_old 2007-05-25 17:23:59.000000000 +0200 +++ /var/tmp/diff_new_pack.z30551/_new 2007-05-25 17:23:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.15.33) +# spec file for package yast2 (Version 2.15.34) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.15.33 +Version: 2.15.34 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.15.33.tar.bz2 +Source0: yast2-2.15.34.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite # SCR::RegisterNewAgents() @@ -101,7 +101,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.15.33 +%setup -n yast2-2.15.34 %build %{prefix}/bin/y2tool y2autoconf @@ -112,6 +112,7 @@ %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} make %{?jobs:-j%jobs} +# removed explicit adding of translations to group desktop files, since it is covered by the general call (they are in a subdirectory) and it caused build fail %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -120,10 +121,6 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done -for f in `find $RPM_BUILD_ROOT/usr/share/applications/YaST2/groups/*.desktop` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/clients mkdir -p "$RPM_BUILD_ROOT"%{prefix}/share/applications/YaST2 mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/images @@ -209,6 +206,17 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Fri May 25 2007 - jsrain(a)suse.cz +- fixed spec file (removed duplicate .desktop files translations) +- removed translations from .desktop-files (#271209) +- 2.15.34 +* Mon May 21 2007 - kmachalkova(a)suse.cz +- Do not show empty xmessage window if nothing is printed to stderr + after yast module has exited (mvidner's patch for #265263) +* Mon May 21 2007 - jsrain(a)suse.cz +- fixed chrp board detection (PPC) (#273606) +- do not check UI mode when enabling the 'Use LDAP' widget in + service dialog (#274649) * Thu May 17 2007 - lslezak(a)suse.cz - Fixed testsuite for String.ycp - 2.15.33 ++++++ yast2-2.15.33.tar.bz2 -> yast2-2.15.34.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/configure new/yast2-2.15.34/configure --- old/yast2-2.15.33/configure 2007-05-17 17:58:46.000000000 +0200 +++ new/yast2-2.15.34/configure 2007-05-25 11:11:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2 2.15.33. +# Generated by GNU Autoconf 2.60 for yast2 2.15.34. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.15.33' -PACKAGE_STRING='yast2 2.15.33' +PACKAGE_VERSION='2.15.34' +PACKAGE_STRING='yast2 2.15.34' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1183,7 +1183,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.15.33 to adapt to many kinds of systems. +\`configure' configures yast2 2.15.34 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1254,7 +1254,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.15.33:";; + short | recursive ) echo "Configuration of yast2 2.15.34:";; esac cat <<\_ACEOF @@ -1332,7 +1332,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.15.33 +yast2 configure 2.15.34 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1346,7 +1346,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.15.33, which was +It was created by yast2 $as_me 2.15.34, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2147,7 +2147,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.15.33' + VERSION='2.15.34' cat >>confdefs.h <<_ACEOF @@ -2374,7 +2374,7 @@ -VERSION="2.15.33" +VERSION="2.15.34" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3366,7 +3366,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.15.33, which was +This file was extended by yast2 $as_me 2.15.34, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3409,7 +3409,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.15.33 +yast2 config.status 2.15.34 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/configure.in new/yast2-2.15.34/configure.in --- old/yast2-2.15.33/configure.in 2007-05-17 17:58:41.000000000 +0200 +++ new/yast2-2.15.34/configure.in 2007-05-25 11:11:32.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.15.33, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.15.34, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.33" +VERSION="2.15.34" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/cwm/src/CWMServiceStart.ycp new/yast2-2.15.34/library/cwm/src/CWMServiceStart.ycp --- old/yast2-2.15.33/library/cwm/src/CWMServiceStart.ycp 2007-03-19 12:55:19.000000000 +0100 +++ new/yast2-2.15.34/library/cwm/src/CWMServiceStart.ycp 2007-05-21 13:40:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for service start widget handling * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWMServiceStart.ycp 36793 2007-03-08 15:36:10Z jsrain $ + * $Id: CWMServiceStart.ycp 38057 2007-05-21 10:42:18Z jsrain $ * */ @@ -679,8 +679,7 @@ ); if (! (haskey (settings, "get_use_ldap") - && haskey (settings, "set_use_ldap") - && ProductFeatures::GetFeature ("globals", "ui_mode") != "simple")) + && haskey (settings, "set_use_ldap"))) { ldap_settings = `VBox (); help = ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/hardware.desktop new/yast2-2.15.34/library/desktop/groups/hardware.desktop --- old/yast2-2.15.33/library/desktop/groups/hardware.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/hardware.desktop 2007-05-25 09:39:05.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-hardware Name=Hardware -Name[cs]=Hardware X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/misc.desktop new/yast2-2.15.34/library/desktop/groups/misc.desktop --- old/yast2-2.15.33/library/desktop/groups/misc.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/misc.desktop 2007-05-25 09:39:16.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-misc Name=Miscellaneous -Name[cs]=Různé X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/network_devices.desktop new/yast2-2.15.34/library/desktop/groups/network_devices.desktop --- old/yast2-2.15.33/library/desktop/groups/network_devices.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/network_devices.desktop 2007-05-25 09:39:19.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-network_devices Name=Network Devices -Name[cs]=Síťová zařízení X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/network_services.desktop new/yast2-2.15.34/library/desktop/groups/network_services.desktop --- old/yast2-2.15.33/library/desktop/groups/network_services.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/network_services.desktop 2007-05-25 09:39:13.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-network_services Name=Network Services -Name[cs]=Síťové služby X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/security.desktop new/yast2-2.15.34/library/desktop/groups/security.desktop --- old/yast2-2.15.33/library/desktop/groups/security.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/security.desktop 2007-05-25 09:39:11.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-security Name=Security and Users -Name[cs]=Bezpečnost a uživatelé X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/software.desktop new/yast2-2.15.34/library/desktop/groups/software.desktop --- old/yast2-2.15.33/library/desktop/groups/software.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/software.desktop 2007-05-25 09:39:22.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-software Name=Software -Name[cs]=Software X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/desktop/groups/system.desktop new/yast2-2.15.34/library/desktop/groups/system.desktop --- old/yast2-2.15.33/library/desktop/groups/system.desktop 2007-01-05 15:35:12.000000000 +0100 +++ new/yast2-2.15.34/library/desktop/groups/system.desktop 2007-05-25 09:39:09.000000000 +0200 @@ -14,5 +14,4 @@ Icon=yast-system Name=System -Name[cs]=Systém X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/modules/Arch.ycp new/yast2-2.15.34/library/modules/Arch.ycp --- old/yast2-2.15.33/library/modules/Arch.ycp 2007-04-23 13:31:40.000000000 +0200 +++ new/yast2-2.15.34/library/modules/Arch.ycp 2007-05-21 10:45:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf(a)suse.de> * Flags: Stable * - * $Id: Arch.ycp 37411 2007-04-12 10:44:24Z mvidner $ + * $Id: Arch.ycp 38053 2007-05-21 07:47:25Z jsrain $ */ { @@ -235,8 +235,7 @@ string board = model["stdout"]:""; y2milestone("model %1 , device_type %2\n", model, device_type); // catch remaining IBM boards - if (device_type["stdout"]:"" == "chrp" - || device_type["stdout"]:"" == "chrp-cbea") + if (issubstring (device_type["stdout"]:"", "chrp")) { _board_compatible = "CHRP"; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/library/modules/Version.ycp new/yast2-2.15.34/library/modules/Version.ycp --- old/yast2-2.15.33/library/modules/Version.ycp 2007-05-17 17:59:05.000000000 +0200 +++ new/yast2-2.15.34/library/modules/Version.ycp 2007-05-25 11:11:45.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.15.33"; +global string yast2 = "2.15.34"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/scripts/yast2 new/yast2-2.15.34/scripts/yast2 --- old/yast2-2.15.33/scripts/yast2 2007-04-23 13:31:42.000000000 +0200 +++ new/yast2-2.15.34/scripts/yast2 2007-05-25 09:13:25.000000000 +0200 @@ -17,14 +17,26 @@ # load common script functions . /usr/lib/YaST2/bin/yast2-funcs +# redirect to $@ if the input is not empty, #265263 +redir_nonempty() +{ + local IFS='' L + read L || return + exec &> >("$@") + echo "$L" + cat +} + # #211392 # if we are in X and do not have _input_ from terminal, # make it output to xmessage redirect() { - XMESSAGE=`type -p xmessage` - if $REDIRECT && [ -n "$DISPLAY" -a ! -t 0 -a -n "$XMESSAGE" ]; then - exec &> >($XMESSAGE -buttons OK:0 -default OK -center -file -) + if [ -n "$DISPLAY" -a ! -t 0 ]; then + XMESSAGE=`type -p xmessage` + if [ -n "$XMESSAGE" ]; then + exec &> >(redir_nonempty $XMESSAGE -buttons OK:0 -default OK -center -file -) + fi fi } # redirect the output if necessary diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.33/VERSION new/yast2-2.15.34/VERSION --- old/yast2-2.15.33/VERSION 2007-05-17 17:57:50.000000000 +0200 +++ new/yast2-2.15.34/VERSION 2007-05-25 11:08:51.000000000 +0200 @@ -1 +1 @@ -2.15.33 +2.15.34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-power-management
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package yast2-power-management checked in at Fri May 25 17:24:06 CEST 2007. -------- --- arch/i386/yast2-power-management/yast2-power-management.changes 2007-03-13 14:48:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-power-management/yast2-power-management.changes 2007-05-25 11:47:57.830248000 +0200 @@ -1,0 +2,6 @@ +Fri May 25 11:44:48 CEST 2007 - jsrain(a)suse.cz + +- removed translations from .desktop-file (#271209) +- 2.15.1 + +------------------------------------------------------------------- Old: ---- yast2-power-management-2.15.0.tar.bz2 New: ---- yast2-power-management-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-power-management.spec ++++++ --- /var/tmp/diff_new_pack.Y30353/_old 2007-05-25 17:23:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Y30353/_new 2007-05-25 17:23:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-power-management (Version 2.15.0) +# spec file for package yast2-power-management (Version 2.15.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-power-management -Version: 2.15.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-power-management-2.15.0.tar.bz2 +Source0: yast2-power-management-2.15.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: gettext @@ -35,7 +35,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-power-management-2.15.0 +%setup -n yast2-power-management-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,9 @@ %doc %{prefix}/share/doc/packages/yast2-power-management %changelog +* Fri May 25 2007 - jsrain(a)suse.cz +- removed translations from .desktop-file (#271209) +- 2.15.1 * Tue Mar 13 2007 - jsrain(a)suse.cz - added the .rnc file (#253599) - 2.15.0 ++++++ yast2-power-management-2.15.0.tar.bz2 -> yast2-power-management-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.15.0/configure new/yast2-power-management-2.15.1/configure --- old/yast2-power-management-2.15.0/configure 2007-03-13 14:47:17.000000000 +0100 +++ new/yast2-power-management-2.15.1/configure 2007-05-25 11:47:46.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-power-management 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-power-management 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-power-management' PACKAGE_TARNAME='yast2-power-management' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-power-management 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-power-management 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-power-management 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-power-management 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-power-management 2.15.0:";; + short | recursive ) echo "Configuration of yast2-power-management 2.15.1:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-power-management configure 2.15.0 +yast2-power-management configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-power-management $as_me 2.15.0, which was +It was created by yast2-power-management $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-power-management' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-power-management $as_me 2.15.0, which was +This file was extended by yast2-power-management $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-power-management config.status 2.15.0 +yast2-power-management config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.15.0/configure.in new/yast2-power-management-2.15.1/configure.in --- old/yast2-power-management-2.15.0/configure.in 2007-03-13 14:47:14.000000000 +0100 +++ new/yast2-power-management-2.15.1/configure.in 2007-05-25 11:47:43.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-power-management dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-power-management, 2.15.0, http://bugs.opensuse.org/, yast2-power-management) +AC_INIT(yast2-power-management, 2.15.1, http://bugs.opensuse.org/, yast2-power-management) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.15.0/src/power-management.desktop new/yast2-power-management-2.15.1/src/power-management.desktop --- old/yast2-power-management-2.15.0/src/power-management.desktop 2007-03-13 14:45:59.000000000 +0100 +++ new/yast2-power-management-2.15.1/src/power-management.desktop 2007-05-21 16:30:25.000000000 +0200 @@ -23,31 +23,3 @@ Name=Power Management GenericName=Configure power management - -Name[bg]=Name(power-management.desktop): Управление на енергията -GenericName[bg]=GenericName(power-management.desktop): Настройване управлението на енергията -Name[cs]=Správa napájení -GenericName[cs]=Nastavit správu napájení -Name[de]=Power- Management -GenericName[de]=Power-Management konfigurieren -Name[es]=Gestión de energía -GenericName[es]=Configurar la gestión de energía -Name[fr]=Gestion de l'alimentation -GenericName[fr]=Configurer la gestion de l'alimentation -Name[hu]=Energiakezelés -GenericName[hu]=Energiagazdálkodás beállítása -Name[it]=Power Management -GenericName[it]=Configura power management -Name[ja]=電源管理 -GenericName[ja]=電源管理を設定 -Name[pl]=Zarządzanie zasilaniem -GenericName[pl]=Konfiguruj zarządzanie energią -Name[pt_BR]=Gerenciamento de Energia -GenericName[pt_BR]=Configurar gerenciamento de energia -Name[sk]=Správa napájania -GenericName[sk]=Konfigurácia správy napájania -Name[zh_CN]=电源管理 -GenericName[zh_CN]=配置电源管理 -Name[zh_TW]=電源管理 -GenericName[zh_TW]=設定電源管理 -X-SuSE-translate=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.15.0/VERSION new/yast2-power-management-2.15.1/VERSION --- old/yast2-power-management-2.15.0/VERSION 2007-03-13 14:28:47.000000000 +0100 +++ new/yast2-power-management-2.15.1/VERSION 2007-05-25 11:45:14.000000000 +0200 @@ -1 +1 @@ -2.15.0 +2.15.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package rpm checked in at Fri May 25 17:22:09 CEST 2007. -------- --- rpm/rpm.changes 2007-05-16 12:16:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-05-25 16:40:34.767471000 +0200 @@ -1,0 +2,11 @@ +Fri May 25 16:18:07 CEST 2007 - mls(a)suse.de + +- fix patch-rpm query +- do not link convertdb1 statically [#274694] +- use --wildcards option for tar [#272519] +- fix perl.prov [#255009] +- show pre/posttrans scripts in --scripts query [#253620] +- remove popt version requires [#246871] +- fix missing file error + +------------------------------------------------------------------- --- rpm/rpm-python.changes 2007-05-03 00:04:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm-python.changes 2007-05-25 16:40:34.724505000 +0200 @@ -1,0 +2,5 @@ +Fri May 25 16:20:53 CEST 2007 - mls(a)suse.de + +- fix unicode queries + +------------------------------------------------------------------- New: ---- perlprov.diff pythonunicode.diff showtransscripts.diff tarwildcards.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.y23224/_old 2007-05-25 17:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.y23224/_new 2007-05-25 17:21:48.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 117 +Release: 122 Requires: rpm = %{version} %py_requires @@ -62,6 +62,8 @@ %{_libdir}/python* %changelog +* Fri May 25 2007 - mls(a)suse.de +- fix unicode queries * Fri Mar 30 2007 - rguenther(a)suse.de - add ncurses-devel and zlib-devel BuildRequires. * Wed Oct 18 2006 - mls(a)suse.de ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.y23224/_old 2007-05-25 17:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.y23224/_new 2007-05-25 17:21:48.000000000 +0200 @@ -16,11 +16,11 @@ BuildRequires: libbz2-devel ncurses-devel zlib-devel Provides: rpminst %define popt_version 1.7 -PreReq: %insserv_prereq %fillup_prereq popt = %{popt_version} permissions +PreReq: %insserv_prereq %fillup_prereq permissions Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 107 +Release: 110 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -121,6 +121,10 @@ Patch92: files.diff Patch93: popt-to-lib.diff Patch94: debugedit-comp-dir.diff +Patch95: pythonunicode.diff +Patch96: tarwildcards.diff +Patch97: perlprov.diff +Patch98: showtransscripts.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -190,7 +194,7 @@ %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 -%patch -P 90 -P 91 -P 92 -P 93 -P 94 +%patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms tar -xjvf %{SOURCE1} @@ -321,7 +325,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 335 +Release: 338 # %description -n popt @@ -344,7 +348,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 335 +Release: 338 Requires: popt = 1.7 Requires: glibc-devel @@ -380,6 +384,14 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Fri May 25 2007 - mls(a)suse.de +- fix patch-rpm query +- do not link convertdb1 statically [#274694] +- use --wildcards option for tar [#272519] +- fix perl.prov [#255009] +- show pre/posttrans scripts in --scripts query [#253620] +- remove popt version requires [#246871] +- fix missing file error * Wed May 16 2007 - mls(a)suse.de - fix autodeps.diff mono logic * Mon May 14 2007 - coolo(a)suse.de ++++++ convertdb1static.diff ++++++ --- /var/tmp/diff_new_pack.y23224/_old 2007-05-25 17:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.y23224/_new 2007-05-25 17:21:48.000000000 +0200 @@ -1,9 +1,10 @@ -Build convertdb1 as static binary so that it always works. +Build convertdb1, too. -diff -ur ./tools/Makefile.am ../rpm-4.4.2.orig/tools/Makefile.am ---- ./tools/Makefile.am 2006-09-21 19:35:56.000000000 +0200 -+++ ../rpm-4.4.2.orig/tools/Makefile.am 2006-09-21 20:59:01.000000000 +0200 -@@ -18,22 +18,26 @@ +Index: tools/Makefile.am +=================================================================== +--- tools/Makefile.am.orig ++++ tools/Makefile.am +@@ -18,22 +18,26 @@ INCLUDES = -I. \ EXTRA_DIST = rpminject.c rpmsort.c rpmxml.c rpmxp.c rpmxp.h hashtab.h @@ -26,7 +27,7 @@ bin_PROGRAMS = rpmgraph convertdb1_SOURCES = convertdb1.c -+convertdb1_LDFLAGS = $(staticLDFLAGS) ++#convertdb1_LDFLAGS = $(staticLDFLAGS) +convertdb1_LDADD = \ + $(top_builddir)/lib/librpm.la \ + @WITH_LIBELF_LIB@ ++++++ patchrpms.diff ++++++ --- /var/tmp/diff_new_pack.y23224/_old 2007-05-25 17:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.y23224/_new 2007-05-25 17:21:48.000000000 +0200 @@ -272,17 +272,19 @@ if ((rc = qva->qva_showPackage(qva, ts, h)) != 0) ec = rc; if (qva->qva_source == RPMQV_DBOFFSET) -@@ -685,7 +708,15 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, A +@@ -685,7 +708,17 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, A switch (qva->qva_source) { case RPMQV_ALL: - qva->qva_gi = rpmgiNew(ts, RPMDBI_PACKAGES, NULL, 0); + if ((!argv || !*argv) && (qva->qva_flags & QUERY_FOR_PATCHES) != 0) { + qva->qva_gi = rpmgiNew(ts, RPMTAG_REQUIRENAME, "rpmlib(PatchRPMs)", 0); ++ qva->qva_gi->mi = rpmtsInitIterator(qva->qva_gi->ts, qva->qva_gi->tag, qva->qva_gi->keyp, qva->qva_gi->keylen); + if (qva->qva_gi->mi == NULL) { + rpmError(RPMERR_QUERYINFO, _("no patch-rpm installed\n")); + break; + } ++ qva->qva_gi->mi = rpmdbFreeIterator(qva->qva_gi->mi); + } else { + qva->qva_gi = rpmgiNew(ts, RPMDBI_PACKAGES, NULL, 0); + } ++++++ perlprov.diff ++++++ Index: scripts/perl.prov =================================================================== --- scripts/perl.prov.orig +++ scripts/perl.prov @@ -127,7 +127,11 @@ sub process_file { if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) { $package=$1; undef $version; - $require{$package}=undef; + if ($package eq 'main') { + undef $package; + } else { + $require{$package}=undef; + } } # after we found the package name take the first assignment to @@ -158,7 +162,7 @@ sub process_file { $version= $1; } - $require{$package}=$version; + $require{$package} ||= $version; } # Allow someone to have a variable that defines virtual packages Index: scripts/perldeps.pl =================================================================== --- scripts/perldeps.pl.orig +++ scripts/perldeps.pl @@ -150,6 +150,10 @@ sub add_provide { return if(exists($self->{'provides_check'}->{$params{'-provide'}})); # + # Skip some common false positives + return if $params{'-provide'} eq 'main'; + + # # Created dependency object my $dep = new Dependency "provide", $params{-provide}; $dep->filename($params{-filename}); ++++++ pythonunicode.diff ++++++ Index: python/rpmts-py.c =================================================================== --- python/rpmts-py.c.orig +++ python/rpmts-py.c @@ -1367,7 +1367,7 @@ fprintf(stderr, "*** rpmts_Match(%p) ts if (Key) { /*@-branchstate@*/ - if (PyString_Check(Key)) { + if (PyString_Check(Key) || PyUnicode_Check(Key)) { key = PyString_AsString(Key); len = PyString_Size(Key); } else if (PyInt_Check(Key)) { ++++++ showtransscripts.diff ++++++ Index: rpmpopt.in =================================================================== --- rpmpopt.in.orig +++ rpmpopt.in @@ -33,6 +33,14 @@ rpm alias --scripts --qf '\ {%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\ \ %|VERIFYSCRIPT?{verify scriptlet:\n%{VERIFYSCRIPT}\n}|\ +\ +%|PRETRANS?{pretrans scriptlet\ +%|PRETRANSPROG?{ (using %{PRETRANSPROG})}|:\n%{PRETRANS}\n}:\ +{%|PRETRANSPROG?{pretrans program: %{PRETRANSPROG}\n}|}|\ +\ +%|POSTTRANS?{posttrans scriptlet\ +%|POSTTRANSPROG?{ (using %{POSTTRANSPROG})}|:\n%{POSTTRANS}\n}:\ +{%|POSTTRANSPROG?{posttrans program: %{POSTTRANSPROG}\n}|}|\ ' \ --POPTdesc=$"list install/erase scriptlets from package(s)" @@ -343,6 +351,14 @@ rpmq alias --scripts --qf '\ {%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\ \ %|VERIFYSCRIPT?{verify scriptlet:\n%{VERIFYSCRIPT}\n}|\ +\ +%|PRETRANS?{pretrans scriptlet\ +%|PRETRANSPROG?{ (using %{PRETRANSPROG})}|:\n%{PRETRANS}\n}:\ +{%|PRETRANSPROG?{pretrans program: %{PRETRANSPROG}\n}|}|\ +\ +%|POSTTRANS?{posttrans scriptlet\ +%|POSTTRANSPROG?{ (using %{POSTTRANSPROG})}|:\n%{POSTTRANS}\n}:\ +{%|POSTTRANSPROG?{posttrans program: %{POSTTRANSPROG}\n}|}|\ ' \ --POPTdesc=$"list install/erase scriptlets from package(s)" @@ -462,6 +478,14 @@ rpmquery alias --scripts --qf '\ {%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\ \ %|VERIFYSCRIPT?{verify scriptlet:\n%{VERIFYSCRIPT}\n}|\ +\ +%|PRETRANS?{pretrans scriptlet\ +%|PRETRANSPROG?{ (using %{PRETRANSPROG})}|:\n%{PRETRANS}\n}:\ +{%|PRETRANSPROG?{pretrans program: %{PRETRANSPROG}\n}|}|\ +\ +%|POSTTRANS?{posttrans scriptlet\ +%|POSTTRANSPROG?{ (using %{POSTTRANSPROG})}|:\n%{POSTTRANS}\n}:\ +{%|POSTTRANSPROG?{posttrans program: %{POSTTRANSPROG}\n}|}|\ ' \ --POPTdesc=$"list install/erase scriptlets from package(s)" ++++++ tarwildcards.diff ++++++ Index: build.c =================================================================== --- build.c.orig +++ build.c @@ -161,7 +161,7 @@ static int buildForTarget(rpmts ts, cons /* Try again */ (void) pclose(fp); - sprintf(cmd, "%s < %s | tar xOvf - \\*.spec 2>&1 > %s", + sprintf(cmd, "%s < %s | tar xOvf - --wildcards \\*.spec 2>&1 > %s", zcmds[res & 0x3], arg, tmpSpecFile); if (!(fp = popen(cmd, "r"))) { rpmError(RPMERR_POPEN, _("Failed to open tar pipe: %m\n")); ++++++ verifylstatfail.diff ++++++ --- /var/tmp/diff_new_pack.y23224/_old 2007-05-25 17:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.y23224/_new 2007-05-25 17:21:49.000000000 +0200 @@ -1,12 +1,14 @@ Tell user the reason why the lstat failed in a verify operation. ---- ./lib/verify.c.orig 2005-12-15 15:17:41.000000000 +0000 -+++ ./lib/verify.c 2005-12-15 15:24:48.000000000 +0000 +Index: lib/verify.c +=================================================================== +--- lib/verify.c.orig ++++ lib/verify.c @@ -327,6 +327,10 @@ static int verifyHeader(QVA_t qva, const (fileAttrs & RPMFILE_README) ? 'r' : ' '), rpmfiFN(fi)); te += strlen(te); -+ if ((rc & RPMVERIFY_LSTATFAIL) != 0) { ++ if ((verifyResult & RPMVERIFY_LSTATFAIL) != 0 && errno != ENOENT) { + sprintf(te, " (%s)", strerror(errno)); + te += strlen(te); + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-kde4
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package qtcurve-kde4 checked in at Fri May 25 17:22:00 CEST 2007. -------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2007-05-15 13:19:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2007-05-25 15:27:40.000000000 +0200 @@ -1,0 +2,22 @@ +Fri May 25 15:26:30 CEST 2007 - stbinner(a)suse.de + +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Use standard buttons for sidebar + buttons, Check/radio colour, Plastik style mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Dont draw text under dockwidget buttons. + - Use 'foreground' colour for menu text. + - Dont't focus highlight for scrollview widgets - makes more + consistent with KDE3 and Gtk2. + - Don't draw toolbar borders for non QMainWindow parented toolbars, + makes more consistent with KDE3 + - Fix some drawing errors with top tabs. + - Darken dock widget title area. + - Fix button shift + +------------------------------------------------------------------- Old: ---- QtCurve-KDE4-0.49.tar.gz New: ---- QtCurve-KDE4-0.50.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.o22794/_old 2007-05-25 17:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.o22794/_new 2007-05-25 17:21:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde4 (Version 0.49) +# spec file for package qtcurve-kde4 (Version 0.50) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 0.49 +Version: 0.50 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.gz @@ -67,5 +67,24 @@ /usr/share/apps/kstyle/themes/qtcurve.themerc %changelog +* Fri May 25 2007 - stbinner(a)suse.de +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Use standard buttons for sidebar + buttons, Check/radio colour, Plastik style mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Dont draw text under dockwidget buttons. + - Use 'foreground' colour for menu text. + - Dont't focus highlight for scrollview widgets - makes more + consistent with KDE3 and Gtk2. + - Don't draw toolbar borders for non QMainWindow parented toolbars, + makes more consistent with KDE3 + - Fix some drawing errors with top tabs. + - Darken dock widget title area. + - Fix button shift * Tue May 15 2007 - stbinner(a)suse.de - initial package in abuild ++++++ QtCurve-KDE4-0.49.tar.gz -> QtCurve-KDE4-0.50.tar.gz ++++++ ++++ 3009 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-kde
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package qtcurve-kde checked in at Fri May 25 17:21:37 CEST 2007. -------- --- KDE/qtcurve-kde/qtcurve-kde.changes 2007-05-15 13:18:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-kde/qtcurve-kde.changes 2007-05-25 15:25:37.000000000 +0200 @@ -1,0 +2,17 @@ +Fri May 25 15:24:34 CEST 2007 - stbinner(a)suse.de + +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Use standard buttons for sidebar + buttons, Check/radio colour, Plastik style mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Draw checks/radios within listviews the same as standard. + - Use 'foreground' colour for menu text. + - Draw dock window titles, and darken background, to be more + consistent with Qt/KDE4. + +------------------------------------------------------------------- Old: ---- QtCurve-KDE3-0.49.tar.gz New: ---- QtCurve-KDE3-0.50.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde.spec ++++++ --- /var/tmp/diff_new_pack.h20320/_old 2007-05-25 17:21:27.000000000 +0200 +++ /var/tmp/diff_new_pack.h20320/_new 2007-05-25 17:21:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde (Version 0.49) +# spec file for package qtcurve-kde (Version 0.50) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: QtCurve style for KDE -Version: 0.49 +Version: 0.50 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE3-%{version}.tar.gz @@ -70,6 +70,20 @@ /opt/kde3/share/apps/QtCurve %changelog +* Fri May 25 2007 - stbinner(a)suse.de +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Use standard buttons for sidebar + buttons, Check/radio colour, Plastik style mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Draw checks/radios within listviews the same as standard. + - Use 'foreground' colour for menu text. + - Draw dock window titles, and darken background, to be more + consistent with Qt/KDE4. * Tue May 15 2007 - stbinner(a)suse.de - update to 0.49: - Add settings for Tab, Listview and Slider appearance ++++++ QtCurve-KDE3-0.49.tar.gz -> QtCurve-KDE3-0.50.tar.gz ++++++ ++++ 3120 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-gtk2
by root＠Hilbert.suse.de 25 May '07

25 May '07

Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Fri May 25 17:21:35 CEST 2007. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-05-15 13:17:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-05-25 15:22:52.000000000 +0200 @@ -1,0 +2,17 @@ +Fri May 25 15:21:38 CEST 2007 - stbinner(a)suse.de + +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Check/radio colour, Plastik mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Draw checks/radios within listviews the same as standard. + - If run under KDE4, then draw checks in menus same as standard checks. + - Move upper spin button down 1 pixel. + - Default to KDE3/Qt3 settings when not run under KDE. + - Improve (slightly) appearance of java apps. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.49.tar.gz New: ---- QtCurve-Gtk2-0.50.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.H19956/_old 2007-05-25 17:21:23.000000000 +0200 +++ /var/tmp/diff_new_pack.H19956/_new 2007-05-25 17:21:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.49) +# spec file for package qtcurve-gtk2 (Version 0.50) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/GNOME Summary: QtCurve style for Gtk2 -Version: 0.49 +Version: 0.50 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz @@ -74,6 +74,20 @@ %pref/share/themes/QtCurve %changelog +* Fri May 25 2007 - stbinner(a)suse.de +- update to 0.50: + - Add settings for: Fill used slider, Round menubar item top only, + Menuitem appearance, Border menuitems, Progressbar appearance, + Gradient progressbar groove, Check/radio colour, Plastik mouse-over + - Dont colour menubar items on mouse over if not colouring menubars. + - When drawing menubar borders, only draw bottom line. + - When drawing toolbar borders, only draw top/bottom or left/right + depending upon orientation. + - Draw checks/radios within listviews the same as standard. + - If run under KDE4, then draw checks in menus same as standard checks. + - Move upper spin button down 1 pixel. + - Default to KDE3/Qt3 settings when not run under KDE. + - Improve (slightly) appearance of java apps. * Tue May 15 2007 - stbinner(a)suse.de - update to 0.49: - Add settings for Tab, Listview and Slider appearance ++++++ QtCurve-Gtk2-0.49.tar.gz -> QtCurve-Gtk2-0.50.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/ChangeLog new/QtCurve-Gtk2-0.50/ChangeLog --- old/QtCurve-Gtk2-0.49/ChangeLog 2007-05-12 23:12:18.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/ChangeLog 2007-05-24 21:31:14.000000000 +0200 @@ -1,3 +1,25 @@ +0.50 +---- +1. Add settings for: + Fill used slider + Round menubar item top only + Menuitem appearance + Border menuitems + Progressbar appearance + Gradient progressbar groove + Check/radio colour + Plastik style mouse-over +2. Dont colour menubar items on mouse over if not colouring menubars. +3. When drawing menubar borders, only draw bottom line. +4. When drawing toolbar borders, only draw top/bottom or left/right + - depending upon orientation. +5. Draw checks/radios within listviews the same as standard. +6. If run under KDE4, then draw checks in menus the same as standard + checks. +7. Move upper spin button down 1 pixel. +8. Default to KDE3/Qt3 settings when not run under KDE. +9. Improve (slightly) appearance of java apps. + 0.49 ---- 1. Add settings for: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/configure new/QtCurve-Gtk2-0.50/configure --- old/QtCurve-Gtk2-0.49/configure 2007-05-13 23:27:49.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/configure 2007-05-24 00:23:11.000000000 +0200 @@ -1925,7 +1925,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.49 +VERSION=0.50 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/configure.in new/QtCurve-Gtk2-0.50/configure.in --- old/QtCurve-Gtk2-0.49/configure.in 2007-05-12 23:12:18.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/configure.in 2007-05-24 00:22:58.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.49 +VERSION=0.50 AC_SUBST(VERSION) AUTOMAKE_OPTIONS=no-dependencies AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/common.h new/QtCurve-Gtk2-0.50/gtk2/common.h --- old/QtCurve-Gtk2-0.49/gtk2/common.h 2007-05-14 23:01:58.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/gtk2/common.h 2007-05-24 00:22:31.000000000 +0200 @@ -53,6 +53,11 @@ */ #define QTC_INCREASE_SB_SLIDER +/* + Enable this to do focus highlighting for scrollviews... NOTE: Gtk2 currently does not do this. +#define QTC_HIGHLIGHT_SCROLVIEWS +*/ + #ifdef __cplusplus #include <qconfig.h> #ifdef QTC_CONFIG_DIALOG @@ -197,6 +202,15 @@ #define QTC_NORM_TAB_APP (APPEARANCE_BEVELLED==opts.tabAppearance ? APPEARANCE_GRADIENT : opts.tabAppearance) #define QTC_SEL_TAB_APP (APPEARANCE_INVERTED==opts.tabAppearance ? APPEARANCE_FLAT : (QTC_NORM_TAB_APP)) +#define QTC_SLIDER_MO_SHADE (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : 2) +#define QTC_SLIDER_MO_LEN (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 4 : 3) +#define QTC_SB_SLIDER_MO_LEN(A) ((A)>31 ? 6 : 4) + +#define QTC_MO_PLASTIK_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : 1) +#define QTC_MO_PLASTIK_LIGHT(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : 0) + +#define QTC_MO_STD_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 4 : 1) +#define QTC_MO_STD_LIGHT(W, S) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : (S ? 1 : 0)) typedef enum { @@ -220,7 +234,8 @@ WIDGET_SLIDER, WIDGET_SLIDER_TROUGH, WIDGET_SB_SLIDER, - WIDGET_SB_TROUGH, + WIDGET_SB_BUTTON, + WIDGET_TROUGH, WIDGET_CHECKBOX, WIDGET_TOGGLE_BUTTON, WIDGET_MENU_ITEM, @@ -239,13 +254,16 @@ WIDGET_OTHER } EWidget; -#define WAPPEARANCE(W) \ - (WIDGET_LISTVIEW_HEADER==W ? opts.lvAppearance \ - : WIDGET_SLIDER==W || WIDGET_SB_SLIDER==W \ - ? opts.sliderAppearance \ - : WIDGET_TAB_TOP==W || WIDGET_TAB_BOT==W \ - ? opts.tabAppearance \ - : opts.appearance) +typedef enum +{ + APPEARANCE_FLAT, + APPEARANCE_DULL_GLASS, + APPEARANCE_SHINY_GLASS, + APPEARANCE_GRADIENT, + APPEARANCE_INVERTED, + APPEARANCE_RAISED, + APPEARANCE_BEVELLED +} EAppearance; #define IS_SLIDER(W) (WIDGET_SLIDER==W || WIDGET_SB_SLIDER==W) #define IS_TOGGLE_BUTTON(W) (WIDGET_TOGGLE_BUTTON==W || WIDGET_CHECKBOX==W) @@ -257,7 +275,7 @@ { case WIDGET_MENU_ITEM: return light ? SHADE_BEVEL_MENU_ITEM_LIGHT : SHADE_BEVEL_MENU_ITEM_DARK; - case WIDGET_SB_TROUGH: + case WIDGET_TROUGH: return light ? SHADE_SBAR_LIGHT : SHADE_SBAR_DARK; case WIDGET_SLIDER_TROUGH: return light ? SHADE_SLIDER_LIGHT : SHADE_SLIDER_DARK; @@ -323,24 +341,18 @@ BORDER_SUNKEN } EBorder; -typedef enum -{ - APPEARANCE_FLAT, - APPEARANCE_DULL_GLASS, - APPEARANCE_SHINY_GLASS, - APPEARANCE_GRADIENT, - APPEARANCE_INVERTED, - APPEARANCE_RAISED, - APPEARANCE_BEVELLED -} EAppearance; - +/* + This whole EShade enum is a complete mess! + For menubars, we dont blend - so blend is selected, and selected is darken + For check/radios - we dont blend, so blend is selected, and we dont allow darken +*/ typedef enum { SHADE_NONE, - SHADE_BLEND_SELECTED, - SHADE_SELECTED, - SHADE_DARKEN = SHADE_SELECTED , /* For menubar only! */ - SHADE_CUSTOM + SHADE_CUSTOM, + SHADE_BLEND_SELECTED, /* In the case of check/radios this is SHADE_SELECTED */ + SHADE_SELECTED, + SHADE_DARKEN = SHADE_SELECTED , /* For menubar only! */ } EShade; typedef enum @@ -359,6 +371,13 @@ SCROLLBAR_NONE } EScrollbar; +typedef enum +{ + MO_NONE, + MO_COLORED, + MO_PLASTIK +} EMouseOver; + #define DEF_IND_STR "fontcolor" #define DEF_LINE_STR "dots" #define DEF_TB_BORDER "none" @@ -450,7 +469,6 @@ animatedProgress, fixParentlessDialogs, customMenuTextColor, - coloredMouseOver, menubarMouseOver, shadeMenubarOnlyWhenActive, thinnerMenuItems, @@ -459,7 +477,16 @@ stdFocus, #endif lvLines, - drawStatusBarFrames; + drawStatusBarFrames, + fillSlider, + roundMbTopOnly, + gradientPbGroove, +#ifdef __cplusplus + stdSidebarButtons, +#endif + borderMenuitems, + colorMenubarMouseOver; + EMouseOver coloredMouseOver; ETBarBorder toolbarBorders; EDefBtnIndicator defBtnIndicator; ELine sliderThumbs, @@ -468,23 +495,55 @@ splitters; EAppearance appearance, menubarAppearance, + menuitemAppearance, toolbarAppearance, lvAppearance, tabAppearance, - sliderAppearance; + sliderAppearance, + progressAppearance; EShade shadeSliders, - shadeMenubars; + shadeMenubars, + shadeCheckRadio; EScrollbar scrollbarType; color customMenubarsColor, customSlidersColor, customMenuNormTextColor, - customMenuSelTextColor; + customMenuSelTextColor, + customCheckRadioColor; #ifndef __cplusplus } Options; #else }; #endif +#ifndef QTC_CONFIG_DIALOG +static EAppearance widgetApp(EWidget w, const Options *opts) +{ + switch(w) + { + case WIDGET_LISTVIEW_HEADER: + return opts->lvAppearance; + case WIDGET_SB_BUTTON: + case WIDGET_SLIDER: + case WIDGET_SB_SLIDER: + return opts->sliderAppearance; + case WIDGET_TAB_TOP: + case WIDGET_TAB_BOT: + return opts->tabAppearance; + case WIDGET_MENU_ITEM: + return opts->menuitemAppearance; + case WIDGET_PROGRESSBAR: + return opts->progressAppearance; + case WIDGET_SLIDER_TROUGH: + return APPEARANCE_FLAT==opts->appearance || APPEARANCE_RAISED==opts->appearance + ? APPEARANCE_FLAT : APPEARANCE_GRADIENT; + default: + break; + } + + return opts->appearance; +}; +#endif #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/config_file.c new/QtCurve-Gtk2-0.50/gtk2/config_file.c --- old/QtCurve-Gtk2-0.49/gtk2/config_file.c 2007-05-14 23:01:58.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/gtk2/config_file.c 2007-05-24 21:29:28.000000000 +0200 @@ -103,6 +103,20 @@ return def; } +static EMouseOver toMouseOver(const char *str, EMouseOver def) +{ + if(str) + { + if(0==memcmp(str, "true", 4) || 0==memcmp(str, "colored", 7)) + return MO_COLORED; + if(0==memcmp(str, "plastik", 7)) + return MO_PLASTIK; + if(0==memcmp(str, "false", 4) || 0==memcmp(str, "none", 4)) + return MO_NONE; + } + return def; +} + static EAppearance toAppearance(const char *str, EAppearance def) { if(str) @@ -480,6 +494,9 @@ #define QTC_CFG_READ_TB_BORDER(ENTRY) \ opts->ENTRY=toTBarBorder(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), def->ENTRY); +#define QTC_CFG_READ_MOUSE_OVER(ENTRY) \ + opts->ENTRY=toMouseOver(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), def->ENTRY); + #define QTC_CFG_READ_APPEARANCE(ENTRY, DEF) \ opts->ENTRY=toAppearance(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), DEF); @@ -556,12 +573,14 @@ QTC_CFG_READ_BOOL(highlightTab) QTC_CFG_READ_SHADE(shadeSliders, false) QTC_CFG_READ_SHADE(shadeMenubars, true) + QTC_CFG_READ_SHADE(shadeCheckRadio, false) QTC_CFG_READ_APPEARANCE(menubarAppearance, def->menubarAppearance) + QTC_CFG_READ_APPEARANCE(menuitemAppearance, opts->appearance) QTC_CFG_READ_APPEARANCE(toolbarAppearance, def->toolbarAppearance) QTC_CFG_READ_LINE(toolbarSeparators) QTC_CFG_READ_LINE(splitters) QTC_CFG_READ_BOOL(customMenuTextColor) - QTC_CFG_READ_BOOL(coloredMouseOver) + QTC_CFG_READ_MOUSE_OVER(coloredMouseOver) QTC_CFG_READ_BOOL(menubarMouseOver) QTC_CFG_READ_BOOL(shadeMenubarOnlyWhenActive) QTC_CFG_READ_BOOL(thinnerMenuItems) @@ -569,22 +588,36 @@ QTC_CFG_READ_COLOR(customMenubarsColor) QTC_CFG_READ_COLOR(customMenuSelTextColor) QTC_CFG_READ_COLOR(customMenuNormTextColor) + QTC_CFG_READ_COLOR(customCheckRadioColor) QTC_CFG_READ_SCROLLBAR(scrollbarType) QTC_CFG_READ_BOOL(shadowButtons) QTC_CFG_READ_APPEARANCE(lvAppearance, opts->appearance) QTC_CFG_READ_APPEARANCE(tabAppearance, opts->appearance) QTC_CFG_READ_APPEARANCE(sliderAppearance, opts->appearance) + QTC_CFG_READ_APPEARANCE(progressAppearance, opts->appearance) #ifndef QTC_PLAIN_FOCUS_ONLY QTC_CFG_READ_BOOL(stdFocus) #endif QTC_CFG_READ_BOOL(lvLines) QTC_CFG_READ_BOOL(drawStatusBarFrames) + QTC_CFG_READ_BOOL(fillSlider) + QTC_CFG_READ_BOOL(roundMbTopOnly) + QTC_CFG_READ_BOOL(borderMenuitems) + QTC_CFG_READ_BOOL(gradientPbGroove) +#ifdef __cplusplus + QTC_CFG_READ_BOOL(stdSidebarButtons) + QTC_CFG_READ_BOOL(colorMenubarMouseOver) +#endif #ifndef __cplusplus releaseConfig(cfg); #endif + if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) + opts->shadeCheckRadio=SHADE_SELECTED; + checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); checkColor(&opts->shadeSliders, &opts->customSlidersColor); + checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor); if(APPEARANCE_BEVELLED==opts->toolbarAppearance) opts->toolbarAppearance=APPEARANCE_GRADIENT; @@ -609,6 +642,9 @@ if(opts->animatedProgress && !opts->stripedProgress) opts->animatedProgress=false; + if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems) + opts->colorMenubarMouseOver=true; + return true; } } @@ -647,22 +683,25 @@ opts->highlightTab=true; opts->embolden=false; opts->appearance=APPEARANCE_BEVELLED; - opts->lvAppearance=APPEARANCE_BEVELLED; + opts->lvAppearance=opts->appearance; opts->tabAppearance=APPEARANCE_GRADIENT; opts->sliderAppearance=APPEARANCE_GRADIENT; opts->menubarAppearance=APPEARANCE_GRADIENT; + opts->menuitemAppearance=opts->appearance; opts->toolbarAppearance=APPEARANCE_GRADIENT; + opts->progressAppearance=opts->appearance; opts->defBtnIndicator=IND_COLORED; opts->sliderThumbs=LINE_DOTS; opts->handles=LINE_DOTS; opts->shadeSliders=SHADE_BLEND_SELECTED; opts->shadeMenubars=SHADE_DARKEN; + opts->shadeCheckRadio=SHADE_NONE; opts->toolbarBorders=TB_NONE; opts->toolbarSeparators=LINE_DOTS; opts->splitters=LINE_DOTS; opts->fixParentlessDialogs=false; opts->customMenuTextColor=false; - opts->coloredMouseOver=true; + opts->coloredMouseOver=MO_PLASTIK; opts->menubarMouseOver=true; opts->shadeMenubarOnlyWhenActive=true; opts->thinnerMenuItems=false; @@ -673,16 +712,24 @@ #endif opts->lvLines=false; opts->drawStatusBarFrames=false; + opts->fillSlider=true; + opts->roundMbTopOnly=true; + opts->borderMenuitems=true; + opts->gradientPbGroove=true; + opts->colorMenubarMouseOver=false; #ifdef __cplusplus + opts->stdSidebarButtons=false; opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); opts->customMenuNormTextColor.setRgb(0, 0, 0); opts->customMenuSelTextColor.setRgb(0, 0, 0); + opts->customCheckRadioColor.setRgb(0, 0, 0); #else opts->customMenubarsColor.red=opts->customMenubarsColor.green=opts->customMenubarsColor.blue=0; opts->customSlidersColor.red=opts->customSlidersColor.green=opts->customSlidersColor.blue=0; opts->customMenuNormTextColor.red=opts->customMenuNormTextColor.green=opts->customMenuNormTextColor.blue=0; opts->customMenuSelTextColor.red=opts->customMenuSelTextColor.green=opts->customMenuSelTextColor.blue=0; + opts->customCheckRadioColor.red=opts->customCheckRadioColor.green=opts->customCheckRadioColor.blue=0; #endif /* Read system config file... */ @@ -741,6 +788,19 @@ } } +static const char *toStr(EMouseOver mo) +{ + switch(mo) + { + case MO_COLORED: + return "colored"; + case MO_NONE: + return "none"; + default: + return "plastik"; + } +} + static const char *toStr(EAppearance exp) { switch(exp) @@ -762,7 +822,7 @@ } } -static const char *toStr(EShade exp, bool dark) +static const char *toStr(EShade exp, bool dark, bool convertBlendSelToSel) { switch(exp) { @@ -770,9 +830,10 @@ case SHADE_NONE: return "none"; case SHADE_BLEND_SELECTED: - return "selected"; + return dark || !convertBlendSelToSel ? "selected" : "origselected"; case SHADE_CUSTOM: return "custom"; + /* case SHADE_SELECTED */ case SHADE_DARKEN: return dark ? "darken" : "origselected"; } @@ -841,6 +902,12 @@ else \ CFG.writeEntry(#ENTRY, toStr(opts.ENTRY, B)); +#define CFG_WRITE_ENTRY_SHADE(ENTRY, DARK, CONVERT_SHADE) \ + if (!exportingStyle && def.ENTRY==opts.ENTRY) \ + CFG.deleteEntry(#ENTRY); \ + else \ + CFG.writeEntry(#ENTRY, toStr(opts.ENTRY, DARK, CONVERT_SHADE)); + #define CFG_WRITE_ENTRY_D(ENTRY) \ if (!exportingStyle && def.ENTRY==opts.ENTRY) \ CFG.deleteEntry(#ENTRY); \ @@ -888,9 +955,11 @@ CFG_WRITE_ENTRY_B(sliderThumbs, true) CFG_WRITE_ENTRY_B(handles, false) CFG_WRITE_ENTRY(highlightTab) - CFG_WRITE_ENTRY_B(shadeSliders, false) - CFG_WRITE_ENTRY_B(shadeMenubars, true) + CFG_WRITE_ENTRY_SHADE(shadeSliders, false, false) + CFG_WRITE_ENTRY_SHADE(shadeMenubars, true, false) + CFG_WRITE_ENTRY_SHADE(shadeCheckRadio, false, true) CFG_WRITE_ENTRY(menubarAppearance) + CFG_WRITE_ENTRY_FORCE(menuitemAppearance) CFG_WRITE_ENTRY(toolbarAppearance) CFG_WRITE_ENTRY_B(toolbarSeparators, true) CFG_WRITE_ENTRY_B(splitters, false) @@ -903,17 +972,25 @@ CFG_WRITE_ENTRY(customMenubarsColor) CFG_WRITE_ENTRY(customMenuSelTextColor) CFG_WRITE_ENTRY(customMenuNormTextColor) + CFG_WRITE_ENTRY(customCheckRadioColor) CFG_WRITE_ENTRY(scrollbarType) CFG_WRITE_ENTRY(shadowButtons) CFG_WRITE_ENTRY_FORCE(lvAppearance) CFG_WRITE_ENTRY_FORCE(tabAppearance) CFG_WRITE_ENTRY_FORCE(sliderAppearance) + CFG_WRITE_ENTRY_FORCE(progressAppearance) #ifndef QTC_PLAIN_FOCUS_ONLY CFG_WRITE_ENTRY(stdFocus) #endif CFG_WRITE_ENTRY(lvLines) CFG_WRITE_ENTRY(drawStatusBarFrames) - + CFG_WRITE_ENTRY(fillSlider) + CFG_WRITE_ENTRY(roundMbTopOnly) + CFG_WRITE_ENTRY(borderMenuitems) + CFG_WRITE_ENTRY(gradientPbGroove) +#ifdef __cplusplus + CFG_WRITE_ENTRY(stdSidebarButtons) +#endif cfg->sync(); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qtcurve.c new/QtCurve-Gtk2-0.50/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.49/gtk2/qtcurve.c 2007-05-14 23:01:10.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/gtk2/qtcurve.c 2007-05-24 21:31:14.000000000 +0200 @@ -43,7 +43,7 @@ /* * Disabled, for the moment, due to not working very well... * 1. Seems to mouse over for the whole toolbar - * 2. When a toolbar is made floating, the mouse over efect does not turn "off" :-( + * 2. When a toolbar is made floating, the mouse over effect does not turn "off" :-( #define QTC_MOUSEOVER_HANDLES */ @@ -1478,9 +1478,8 @@ DF_BLEND = 0x004, DF_DO_CORNERS = 0x008, DF_SUNKEN = 0x010, - DF_DO_FILL = 0x020, - DF_DO_BORDER = 0x040, - DF_VERT = 0x080 + DF_DO_BORDER = 0x020, + DF_VERT = 0x040 } EDrawFlags; #define drawBorder(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) \ @@ -1491,7 +1490,7 @@ GdkColor *bgnd, GdkGC **c_gcs, GdkColor *c_colors, int round, EBorder borderProfile, EWidget widget, int flags, int borderVal) { - EAppearance app=WAPPEARANCE(widget); + EAppearance app=widgetApp(widget, &opts); QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; gboolean useText=WIDGET_DEF_BUTTON==widget && IND_FONT_COLOR==opts.defBtnIndicator && GTK_STATE_INSENSITIVE!=state; @@ -1712,15 +1711,19 @@ GdkGC **inside_gcs, int round, EWidget widget, EBorder borderProfile, int flags) { - EAppearance app=WAPPEARANCE(widget); + EAppearance app=widgetApp(widget, &opts); QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; gboolean sunken=flags&DF_SUNKEN, - colouredMouseOver=opts.coloredMouseOver && qtcurveStyle->mouseover_gc[0] && + doColouredMouseOver=opts.coloredMouseOver && qtcurveStyle->mouseover_gc[0] && GTK_STATE_PRELIGHT==state && - !IS_SLIDER(widget) && (IS_TOGGLE_BUTTON(widget) || !sunken), + (!IS_SLIDER(widget) || (WIDGET_SB_SLIDER==widget && MO_PLASTIK==opts.coloredMouseOver)) && + (IS_TOGGLE_BUTTON(widget) || !sunken), + plastikMouseOver=doColouredMouseOver && MO_PLASTIK==opts.coloredMouseOver, + colouredMouseOver=doColouredMouseOver && MO_COLORED==opts.coloredMouseOver, lightBorder=QTC_DRAW_LIGHT_BORDER(sunken, widget, app), bevelledButton=WIDGET_BUTTON(widget) && APPEARANCE_BEVELLED==app, - doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget) && ROUND_FULL==opts.round; + doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget) && ROUND_FULL==opts.round, + horiz=!(flags&DF_VERT); int bx=x, by=y, bw=width, bh=height; if(doEtch) @@ -1748,7 +1751,7 @@ { by+=2; bx+=2; bw-=4; bh-=4; } - else if(flags&DF_VERT) + else if(!horiz) { by+=2; bx++; bw-=3; bh-=4; } @@ -1761,9 +1764,9 @@ { int dark=bevelledButton ? 2 : 4; GdkGC **ingcs=inside_gcs ? inside_gcs : gcs, - *gc1=colouredMouseOver ? qtcurveStyle->mouseover_gc[sunken ? 1 : 0] + *gc1=colouredMouseOver ? qtcurveStyle->mouseover_gc[QTC_MO_STD_LIGHT(widget, sunken)] : ingcs[sunken ? dark : 0], - *gc2=colouredMouseOver ? qtcurveStyle->mouseover_gc[1] + *gc2=colouredMouseOver ? qtcurveStyle->mouseover_gc[QTC_MO_STD_DARK(widget)] : ingcs[sunken ? 0 : dark]; setClipping(gc1, area, region); @@ -1802,12 +1805,88 @@ unsetClipping(lbGc, area, region); } - if(flags&DF_DO_FILL && bw>0 && bh>0) + if(bw>0 && bh>0) + { drawBevelGradient(style, window, area, region, bx, by, bw, bh, base, getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken), - !(flags&DF_VERT), !sunken, sunken, app, + horiz, !sunken, sunken, app, widget); + if(plastikMouseOver) + { + if(WIDGET_SB_SLIDER==widget) + { + int len=QTC_SB_SLIDER_MO_LEN(horiz ? width : height), + so=lightBorder ? 2 : 1, + eo=len+so, + col=QTC_SLIDER_MO_SHADE; + + if(horiz) + { + drawBevelGradient(style, window, area, region, x+so, y, len, height, &qtcurveStyle->mouseover[col], + getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken), + horiz, !sunken, sunken, app, + widget); + drawBevelGradient(style, window, area, region, x+width-eo, y, len, height, &qtcurveStyle->mouseover[col], + getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken), + horiz, !sunken, sunken, app, + widget); + } + else + { + drawBevelGradient(style, window, area, region, x, y+so, width, len, &qtcurveStyle->mouseover[col], + getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken), + horiz, !sunken, sunken, app, + widget); + drawBevelGradient(style, window, area, region, x, y+height-eo, width, len, &qtcurveStyle->mouseover[col], + getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken), + horiz, !sunken, sunken, app, + widget); + } + } + else + { + int mh=height; + GdkGC *gc=qtcurveStyle->mouseover_gc[QTC_MO_PLASTIK_DARK(widget)]; + bool horizontal=(horiz && !(WIDGET_SB_BUTTON==widget || WIDGET_SB_SLIDER==widget))|| + (!horiz && (WIDGET_SB_BUTTON==widget || WIDGET_SB_SLIDER==widget)), + thin=WIDGET_SB_BUTTON==widget || WIDGET_SPIN_UP==widget || WIDGET_SPIN_DOWN==widget || + ((horiz ? height : width)<16); + + if(WIDGET_SPIN_UP==widget && horiz) + mh--; + setClipping(gc, area, region); + if(horizontal) + { + gdk_draw_line(window, gc, x+1, y+1, x+width-2, y+1); + gdk_draw_line(window, gc, x+1, y+mh-2, x+width-2, y+mh-2); + } + else + { + gdk_draw_line(window, gc, x+1, y+1, x+1, y+mh-2); + gdk_draw_line(window, gc, x+width-2, y+1, x+width-2, y+mh-2); + } + unsetClipping(gc, area, region); + if(!thin) + { + gc=qtcurveStyle->mouseover_gc[QTC_MO_PLASTIK_LIGHT(widget)]; + setClipping(gc, area, region); + if(horizontal) + { + gdk_draw_line(window, gc, x+1, y+2, x+width-2, y+2); + gdk_draw_line(window, gc, x+1, y+mh-3, x+width-2, y+mh-3); + } + else + { + gdk_draw_line(window, gc, x+2, y+1, x+2, y+mh-2); + gdk_draw_line(window, gc, x+width-3, y+1, x+width-3, y+mh-2); + } + unsetClipping(gc, area, region); + } + } + } + } + if(flags&DF_DO_BORDER) drawBorder(style, window, state, area, region, x, y, width, height, bgnd, gcs, colors, round, borderProfile, widget, flags); @@ -1925,7 +2004,7 @@ gint height, int round, gboolean isCombo) { QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; - gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget), + gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget) && GTK_APP_JAVA!=qtSettings.app, doEtch=ROUND_FULL==opts.round; GdkGC **gcs=highlight ? qtcurveStyle->menuitem_gc : qtcurveStyle->background_gc, *bgnd_gc=style->bg_gc[state], @@ -2099,7 +2178,7 @@ } if( ( GTK_STATE_PRELIGHT==state && (detail && 0==strcmp(detail, QTC_PANED) ) ) ) drawAreaMod(style, window, GTK_STATE_PRELIGHT, area, NULL, opts.highlightFactor, x, y, width, height); - else + else if(!(GTK_APP_JAVA==qtSettings.app && widget && GTK_IS_LABEL(widget))) { parent_class->draw_flat_box(style, window, state, shadow_type, area, widget, detail, x, y, width, height); @@ -2225,46 +2304,6 @@ } } -static void drawArrowHLine(GdkWindow *window, GdkGC *gc, int x1, int x2, int y, gboolean last) -{ - if(x2 - x1 < 7 && !last) /* 7 to get garretts pixels, otherwise 6 */ - gdk_draw_line(window, gc, x1, y, x2, y); - else if(last) - { - if(x2 - x1 <= 7) - { - gdk_draw_line(window, gc, x1+1, y, x1+1, y); - gdk_draw_line(window, gc, x2-1, y, x2-1, y); - } - else - { - gdk_draw_line(window, gc, x1+2, y, x1+2, y); - gdk_draw_line(window, gc, x2-2, y, x2-2, y); - } - } - else - { - gdk_draw_line(window, gc, x1, y, x1+2, y); - gdk_draw_line(window, gc, x2-2, y, x2, y); - } -} - -static void drawArrowVLine(GdkWindow *window, GdkGC *gc, int y1, int y2, int x, gboolean last) -{ - if(y2 - y1 < 7 && !last) /* 7 to get garretts pixels */ - gdk_draw_line(window, gc, x, y1, x, y2); - else if(last) - { - gdk_draw_line(window, gc, x, y1+2, x, y1+2); - gdk_draw_line(window, gc, x, y2-2, x, y2-2); - } - else - { - gdk_draw_line(window, gc, x, y1, x, y1+2); - gdk_draw_line(window, gc, x, y2-2, x, y2); - } -} - static void drawArrow(GdkWindow *window, GdkGC *gc, GdkRectangle *area, GtkArrowType arrow_type, gint x, gint y, gint width, gint height) { @@ -2345,9 +2384,9 @@ if(isSpinButton) { - if(GTK_ARROW_UP==arrow_type) + /*if(GTK_ARROW_UP==arrow_type) y-=1; - else if(GTK_ARROW_DOWN==arrow_type) + else*/ if(GTK_ARROW_DOWN==arrow_type) y+=1; } @@ -2490,7 +2529,7 @@ else if(-1==height) gdk_window_get_size(window, NULL, &height); - if(menubar && GTK_APP_MOZILLA!=qtSettings.app && + if(menubar && GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app && (opts.menubarMouseOver || opts.shadeMenubarOnlyWhenActive)) { GtkWidget **mbHash=lookupMenubarHash(widget, FALSE); @@ -2527,7 +2566,7 @@ drawLightBevel(style, window, state, area, NULL, x, y, width, height, &btn_colors[bgnd], NULL, btn_gcs, btn_colors, NULL, round, wid, BORDER_FLAT, - DF_LARGE_ARC|DF_DO_CORNERS|DF_DO_BORDER|DF_DO_FILL| + DF_LARGE_ARC|DF_DO_CORNERS|DF_DO_BORDER| (sunken ? DF_SUNKEN : 0)); } else if(DETAIL("spinbutton")) @@ -2596,7 +2635,7 @@ EStepper step=getStepper(widget, x, y); EWidget widgetType=slider ? WIDGET_SB_SLIDER - : hscale||vscale||sbar + : hscale||vscale ? WIDGET_SLIDER : lvh ? WIDGET_LISTVIEW_HEADER @@ -2610,7 +2649,9 @@ ? defBtn ? WIDGET_DEF_BUTTON : WIDGET_STD_BUTTON - : WIDGET_OTHER; + : stepper || sbar + ? WIDGET_SB_BUTTON + : WIDGET_OTHER; if(GTK_APP_MOZILLA!=qtSettings.app) { @@ -2708,7 +2749,7 @@ BORDER_FLAT, (!checkbox && width>=QTC_MIN_BTN_SIZE && height>=QTC_MIN_BTN_SIZE ? DF_LARGE_ARC : 0)| (slider ? 0 : DF_DO_CORNERS)|(sunken ? DF_SUNKEN : 0)| - DF_DO_FILL|(lvh ? 0 : DF_DO_BORDER)| + (lvh ? 0 : DF_DO_BORDER)| (horiz ? 0 : DF_VERT)); #ifndef QTC_SIMPLE_SCROLLBARS @@ -2770,7 +2811,7 @@ BORDER_FLAT, DF_LARGE_ARC| /*(draw_inside ? DF_DRAW_INSIDE : 0) |*/ DF_DO_CORNERS|(sunken ? DF_SUNKEN : 0)| - DF_DO_FILL|DF_DO_BORDER|(horiz ? 0 : DF_VERT)); + DF_DO_BORDER|(horiz ? 0 : DF_VERT)); gdk_region_destroy(inner_region); gdk_region_destroy(outer_region); @@ -2930,10 +2971,10 @@ drawLightBevel(style, window, state, area, NULL, x, y, width, height, bgndcol, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, NULL, ROUNDED_ALL, WIDGET_SLIDER_TROUGH, - BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER| + BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER| (horiz ? 0 : DF_VERT)); - if(adjustment->upper!=adjustment->lower && state!=GTK_STATE_INSENSITIVE) + if(opts.fillSlider && adjustment->upper!=adjustment->lower && state!=GTK_STATE_INSENSITIVE) { if(horiz) { @@ -2969,16 +3010,22 @@ drawLightBevel(style, window, state, area, NULL, used_x, used_y, used_w, used_h, usedcol, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, NULL, ROUNDED_ALL, WIDGET_SLIDER_TROUGH, - BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER| + BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER| (horiz ? 0 : DF_VERT)); } } } - else if(GTK_IS_PROGRESS_BAR(widget)) + else if(pbar) { gdk_draw_rectangle(window, bgnd, TRUE, x, y, width, height); - if(GTK_STATE_INSENSITIVE!=state) + if(opts.gradientPbGroove) + drawBevelGradient(style, window, area, NULL, x+1, y+1, width-2, height-2, + GTK_STATE_INSENSITIVE==state ? &(qtcurveStyle->background[ORIGINAL_SHADE]) + : &(style->base[state]), + getWidgetShade(WIDGET_TROUGH, TRUE, FALSE), getWidgetShade(WIDGET_TROUGH, FALSE, FALSE), + horiz, FALSE, FALSE, APPEARANCE_GRADIENT, WIDGET_TROUGH); + else if(GTK_STATE_INSENSITIVE!=state) { if(area) gdk_gc_set_clip_rectangle(style->base_gc[state], area); @@ -3014,8 +3061,8 @@ drawLightBevel(style, window, state, area, NULL, x, y, width, height, &qtcurveStyle->background[2], NULL, qtcurveStyle->background_gc, - qtcurveStyle->background, NULL, sbarRound, WIDGET_SB_TROUGH, - BORDER_FLAT, DF_LARGE_ARC|DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER| + qtcurveStyle->background, NULL, sbarRound, WIDGET_TROUGH, + BORDER_FLAT, DF_LARGE_ARC|DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER| (horiz ? 0 : DF_VERT)); } @@ -3098,10 +3145,10 @@ if(TB_NONE!=opts.toolbarBorders) { gboolean top=FALSE, - bottom=FALSE, - left=FALSE, - right=FALSE; - int border=TB_DARK==opts.toolbarBorders ? 5 : 3; + bottom=FALSE, + left=FALSE, + right=FALSE; + int border=TB_DARK==opts.toolbarBorders ? 3 : 4; GdkGC **gcs=activeWindow && menubar && USE_SHADED_MENU_BAR_COLORS ? qtcurveStyle->menubar_gc : qtcurveStyle->background_gc; @@ -3112,31 +3159,22 @@ } if(menubar) - top=bottom=left=right=TRUE; - else if(0==strcmp(detail,"toolbar")) /* && (GTK_IS_TOOLBAR(widget) || + bottom=TRUE; + else if(0==strcmp(detail,"toolbar") || /* && (GTK_IS_TOOLBAR(widget) || WIDGET_TYPE_NAME("BonoboUIToolbar"))) */ - { - if(!GTK_IS_TOOLBAR(widget)) - if(width>height) - top=bottom=right=TRUE; - else /* MUST have a handle */ - left=right=bottom=TRUE; - else - top=bottom=left=right=TRUE; - } - else if(0==strcmp(detail,"dockitem_bin") || /* CPD: bit risky - what if only 1 item ??? */ + 0==strcmp(detail,"dockitem_bin") || 0==strcmp(detail, "handlebox_bin")) { - if(width<height) - left=right=bottom=TRUE; + if(width>height) + top=bottom=TRUE; else - top=bottom=right=TRUE; + left=right=TRUE; } else /* handle */ - if(width<height) /* on horiz toolbar */ - top=bottom=left=TRUE; + if(width>height) /* on vertical toolbar */ + left=right=TRUE; else - left=right=top=TRUE; + top=bottom=TRUE; if(top) gdk_draw_line(window, gcs[0], x, y, x + width-1, y); @@ -3144,7 +3182,7 @@ gdk_draw_line(window, gcs[0], x, y, x, y+height-1); if(bottom) gdk_draw_line(window, gcs[border], x, y + height - 1, x + width-1, - y + height - 1); + y + height - 1); if(right) gdk_draw_line(window, gcs[border], x+width-1, y, x + width-1, y + height - 1); @@ -3214,11 +3252,13 @@ } { - GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app + GdkColor *itemCols=!opts.colorMenubarMouseOver && mb && !active_mb ? qtcurveStyle->background : qtcurveStyle->menuitem; + GdkGC **itemGcs=!opts.colorMenubarMouseOver && mb && !active_mb ? qtcurveStyle->background_gc : qtcurveStyle->menuitem_gc; + GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app ? &qtcurveStyle->menubar[ORIGINAL_SHADE] : NULL; int round=pbar ? progressbarRound(widget, rev) : mb - ? active_mb + ? active_mb && opts.roundMbTopOnly ? ROUNDED_TOP : ROUNDED_ALL : ROUNDED_ALL, @@ -3239,25 +3279,31 @@ x--; y--; width+=2, height+=2; } - if(stdColors) + if(!opts.borderMenuitems && (mb || menuitem)) + drawBevelGradient(style, window, area, region, x, y, width, height, + &itemCols[ORIGINAL_SHADE], + getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE), + getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE), + TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); + else if(stdColors) drawLightBevel(style, window, new_state, area, NULL, x, y, - width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd, - qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, + width, height, &itemCols[ORIGINAL_SHADE], bgnd, + itemGcs, itemCols, NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, DF_LARGE_ARC|DF_DRAW_INSIDE|(horiz ? 0 : DF_VERT)| - (border&&stdColors ? DF_DO_BORDER : 0)|DF_DO_FILL| + (border&&stdColors ? DF_DO_BORDER : 0)| (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); else { if(width>2 && height>2) drawBevelGradient(style, window, area, region, x+1, y+1, width-2, height-2, - &qtcurveStyle->menuitem[ORIGINAL_SHADE], + &itemCols[ORIGINAL_SHADE], getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE), getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE), - TRUE, TRUE, FALSE, opts.appearance, WIDGET_MENU_ITEM); + TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); realDrawBorder(style, window, state, area, NULL, x, y, width, height, bgnd, - qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, round, BORDER_FLAT, + itemGcs, itemCols, round, BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 0); } @@ -3266,7 +3312,7 @@ width, height, &qtcurveStyle->menuitem[1], NULL, qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|DF_DO_FILL|(horiz ? 0 : DF_VERT)| + DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|(horiz ? 0 : DF_VERT)| (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round) @@ -3379,7 +3425,7 @@ { gboolean frame=!detail || 0==strcmp(detail, "frame"), profiledFrame=DETAIL("scrolled_window"), - statusBar=GTK_APP_MOZILLA==qtSettings.app + statusBar=GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app ? frame : isStatusBarFrame(widget); #ifdef QTC_DEBUG @@ -3393,7 +3439,7 @@ if(!statusBar && (frame || profiledFrame) && QTC_ROUNDED) { if(GTK_SHADOW_NONE!=shadow_type && - (!frame || opts.drawStatusBarFrames || GTK_APP_MOZILLA!=qtSettings.app)) + (!frame || opts.drawStatusBarFrames || (GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app))) drawBorder(style, window, state, area, NULL, x, y, width, height, NULL, NULL, NULL, ROUNDED_ALL, profiledFrame ? BORDER_SUNKEN : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC|DF_BLEND|DF_DO_CORNERS); @@ -3507,7 +3553,7 @@ GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { - if(GTK_STATE_PRELIGHT==state && GTK_APP_MOZILLA==qtSettings.app) + if(GTK_STATE_PRELIGHT==state && (GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)) state=GTK_STATE_NORMAL; { @@ -3543,7 +3589,7 @@ if(mnu) { y+=2; - if(GTK_APP_MOZILLA==qtSettings.app) + if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app) x+=2; else x-=2; @@ -3554,6 +3600,7 @@ debugDisplayWidget(widget, 3); #endif +#if 0 if(list) { if(area) @@ -3566,7 +3613,9 @@ if(area) gdk_gc_set_clip_rectangle(style->text_gc[state], NULL); } - else if(!mnu) + else +#endif + if(!mnu || qtSettings.qt4) { gboolean coloredMouseOver=GTK_STATE_PRELIGHT==state && opts.coloredMouseOver; GdkGC **gcs=coloredMouseOver @@ -3584,19 +3633,29 @@ if(area) gdk_gc_set_clip_rectangle(bgndGc, area); + if(mnu) + { + x--; y--; width=QTC_CHECK_SIZE; height=QTC_CHECK_SIZE; + } + else if(list) + { + y++; width=QTC_CHECK_SIZE; height=QTC_CHECK_SIZE; + } + gdk_draw_rectangle(window, bgndGc, TRUE, x+1, y+1, QTC_CHECK_SIZE-2, QTC_CHECK_SIZE-2); if(area) gdk_gc_set_clip_rectangle(bgndGc, NULL); drawBorder(style, window, state, area, NULL, x, y, width, height, - NULL, gcs, colors, ROUNDED_ALL, BORDER_SUNKEN, WIDGET_CHECKBOX, DF_BLEND|DF_DO_CORNERS); + NULL, gcs, colors, ROUNDED_ALL, BORDER_SUNKEN, WIDGET_CHECKBOX, + (list || mnu ? 0 : DF_DO_CORNERS)); } if(area && (on || tri)) { gdk_gc_set_clip_rectangle(style->text_gc[ind_state], area); - if(mnu) + if(!qtSettings.qt4 && mnu) { gdk_gc_set_clip_rectangle(btn_gcs[0], area); gdk_gc_set_clip_rectangle(btn_gcs[5], area); @@ -3606,7 +3665,9 @@ if(on) { - GdkPixbuf *pix=getPixbuf(&style->text[ind_state], PIX_CHECK, 1.0); + GdkPixbuf *pix=getPixbuf(GTK_STATE_INSENSITIVE==state /* || (list && (GTK_STATE_SELECTED==state || GTK_STATE_ACTIVE==state)) */ + ? &style->text[ind_state] + : qtcurveStyle->check_radio, PIX_CHECK, 1.0); int pw=gdk_pixbuf_get_width(pix), ph=gdk_pixbuf_get_height(pix), dx=(x+(QTC_CHECK_SIZE/2))-(pw/2), @@ -3615,7 +3676,7 @@ gdk_draw_pixbuf(window, style->text_gc[ind_state], pix, 0, 0, dx, dy, pw, ph, GDK_RGB_DITHER_MAX, 0, 0); - if(mnu) + if(!qtSettings.qt4 && mnu) { gint x_mnu=x-1, y_mnu=y-1, width_mnu=QTC_CHECK_SIZE+2, height_mnu=QTC_CHECK_SIZE+2; @@ -3663,7 +3724,7 @@ GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { - if(GTK_STATE_PRELIGHT==state && GTK_APP_MOZILLA==qtSettings.app) + if(GTK_STATE_PRELIGHT==state && (GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)) state=GTK_STATE_NORMAL; { @@ -3683,24 +3744,17 @@ x+=(width-QTC_RADIO_SIZE)>>1; y+=(height-QTC_RADIO_SIZE)>>1; +/* if(list) { -#if GTK_MAJOR_VERSION>1 GdkPixbuf *border=getPixbuf(&style->text[state], PIX_RADIO_BORDER, 0.8); gdk_draw_pixbuf(window, style->text_gc[state], border, 0, 0, x, y, gdk_pixbuf_get_width(border), gdk_pixbuf_get_height(border), GDK_RGB_DITHER_MAX, 0, 0); -#else - if(area) - gdk_gc_set_clip_rectangle(style->text_gc[state], area); - gdk_draw_lines(window, style->text_gc[state], outer, 24); - - if(area) - gdk_gc_set_clip_rectangle(style->text_gc[state], NULL); -#endif } else +*/ { GdkGC *new_gcs[TOTAL_SHADES+1], **btn_gcs=NULL; @@ -3793,7 +3847,9 @@ if(on) { - GdkPixbuf *pix=getPixbuf(&style->text[ind_state], PIX_RADIO_ON, 1.0); + GdkPixbuf *pix=getPixbuf(GTK_STATE_INSENSITIVE==state /* || (list && (GTK_STATE_SELECTED==state || GTK_STATE_ACTIVE==state))*/ + ? &style->text[ind_state] + : qtcurveStyle->check_radio, PIX_RADIO_ON, 1.0); gdk_draw_pixbuf(window, style->text_gc[ind_state], pix, 0, 0, x, y, gdk_pixbuf_get_width(pix), gdk_pixbuf_get_height(pix), GDK_RGB_DITHER_MAX, 0, 0); @@ -3820,15 +3876,23 @@ parent_class->draw_layout(style, window, state, use_text, area, widget, detail, x, y, layout); else { - gboolean isMenuItem=QTC_IS_MENU_ITEM(widget), - isMenuBarItem=isMenuItem && NULL!=isMenubar(widget, 0), - selectedText=isMenuItem && GTK_STATE_PRELIGHT==state, - but=FALSE, - def_but=FALSE, - swap_gc=FALSE; + gboolean isMenuItem=QTC_IS_MENU_ITEM(widget); + GtkMenuBar *mb=isMenuItem ? isMenubar(widget, 0) : NULL; + gboolean activeMb=mb ? GTK_MENU_SHELL(mb)->active : FALSE, + selectedText=isMenuItem && + (opts.colorMenubarMouseOver + ? GTK_STATE_PRELIGHT==state + : ((!mb || activeMb) && GTK_STATE_PRELIGHT==state)), + but=FALSE, + def_but=FALSE, + swap_gc=FALSE; + + if(!opts.colorMenubarMouseOver && mb && !activeMb && GTK_STATE_PRELIGHT==state) + state=GTK_STATE_NORMAL; + #if GTK_CHECK_VERSION(2, 10, 0) && !GTK_CHECK_VERSION(2, 10, 11) - GtkNotebook *nb=isMenuBarItem || isMenuItem || !GTK_IS_LABEL(widget) || - !widget->parent || !GTK_IS_NOTEBOOK(widget->parent)? NULL : GTK_NOTEBOOK(widget->parent); + GtkNotebook *nb=mb || isMenuItem || !GTK_IS_LABEL(widget) || + !widget->parent || !GTK_IS_NOTEBOOK(widget->parent) ? NULL : GTK_NOTEBOOK(widget->parent); #endif GdkGC *prevGcs[4]; gboolean activeWindow=TRUE; @@ -3871,7 +3935,7 @@ } else if(isMenuItem) { - if(isMenuBarItem && activeWindow) + if(mb && activeWindow) { if(opts.customMenuTextColor && qtcurveStyle->menutext_gc[0]) { @@ -4151,7 +4215,7 @@ /* f'in mozilla apps dont really use Gtk widgets - they just paint to a pixmap. So, no way of knowing the position of a tab! The 'best' look seems to be to round both corners. Not nice, but... */ - if(GTK_APP_MOZILLA==qtSettings.app) + if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app) firstTab=lastTab=TRUE; else if(notebook) { @@ -4213,7 +4277,7 @@ debugDisplayWidget(widget, 3); #endif - if(GTK_APP_MOZILLA!=qtSettings.app && !highlightTab && highlightingEnabled) + if(GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app && !highlightTab && highlightingEnabled) { lookupTabHash(widget, TRUE); /* Create hash entry... */ gtk_widget_add_events(widget, GDK_LEAVE_NOTIFY_MASK|GDK_POINTER_MOTION_MASK); @@ -4273,7 +4337,7 @@ drawBorder(style, window, state, area, NULL, x, y-4, width, height+4, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, - active + active || (firstTab && lastTab) ? ROUNDED_BOTTOM : firstTab ? ROUNDED_BOTTOMLEFT @@ -4316,7 +4380,7 @@ drawBorder(style, window, state, area, NULL, x, y, width, height+4, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, - active + active || (firstTab && lastTab) ? ROUNDED_TOP : firstTab ? ROUNDED_TOPLEFT @@ -4355,7 +4419,7 @@ drawBorder(style, window, state, area, NULL, x-4, y, width+4, height, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, - active + active || (firstTab && lastTab) ? ROUNDED_RIGHT : firstTab ? ROUNDED_TOPRIGHT @@ -4399,7 +4463,7 @@ drawBorder(style, window, state, area, NULL, x, y, width+4, height, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, - active + active || (firstTab && lastTab) ? ROUNDED_LEFT : firstTab ? ROUNDED_TOPLEFT @@ -4537,24 +4601,74 @@ gdk_gc_set_clip_region(gcs[bgnd], region); gdk_draw_rectangle(window, gcs[bgnd], TRUE, x+1, y+1, width-2, height-2); gdk_gc_set_clip_region(gcs[bgnd], NULL); + + if(MO_PLASTIK==opts.coloredMouseOver && coloredMouseOver) + { + int col=QTC_SLIDER_MO_SHADE, + len=QTC_SLIDER_MO_LEN; + + gdk_gc_set_clip_region(qtcurveStyle->mouseover_gc[col], region); + if(horiz) + { + gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+1, len, height-2); + gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+width-(1+len), y+1, len, height-2); + } + else + { + gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+1, width-2, len); + gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+height-(1+len), width-2, len); + } + gdk_gc_set_clip_region(qtcurveStyle->mouseover_gc[col], NULL); + } } else + { drawBevelGradient(style, window, NULL, region, x+1, y+1, width-2, height-2, &colors[bgnd], SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER); + if(MO_PLASTIK==opts.coloredMouseOver && coloredMouseOver) + { + int col=QTC_SLIDER_MO_SHADE, + len=QTC_SLIDER_MO_LEN; + + if(horiz) + { + drawBevelGradient(style, window, NULL, region, x+1, y+1, len, height-2, &qtcurveStyle->mouseover[col], + SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, + horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER); + drawBevelGradient(style, window, NULL, region, x+width-(1+len), y+1, len, height-2, &qtcurveStyle->mouseover[col], + SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, + horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER); + } + else + { + drawBevelGradient(style, window, NULL, region, x+1, y+1, width-2, len, &qtcurveStyle->mouseover[col], + SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, + horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER); + drawBevelGradient(style, window, NULL, region, x+1, y+height-(1+len), width-2, len, &qtcurveStyle->mouseover[col], + SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, + horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER); + } + } + } + gdk_region_destroy(region); { GdkPixbuf *border=getPixbuf(&colors[coloredMouseOver ? 4 : 5], - horiz ? PIX_SLIDER : PIX_SLIDER_V, 0.8), - *light=getPixbuf(&colors[0], horiz ? PIX_SLIDER_LIGHT : PIX_SLIDER_LIGHT_V, 1.0); + horiz ? PIX_SLIDER : PIX_SLIDER_V, 0.8); gdk_draw_pixbuf(window, btn_gcs[bgnd], border, 0, 0, x, y, gdk_pixbuf_get_width(border), gdk_pixbuf_get_height(border), GDK_RGB_DITHER_MAX, 0, 0); - gdk_draw_pixbuf(window, btn_gcs[0], light, 0, 0, x, y, gdk_pixbuf_get_width(light), - gdk_pixbuf_get_height(light), GDK_RGB_DITHER_MAX, 0, 0); + if(MO_PLASTIK!=opts.coloredMouseOver || !coloredMouseOver) + { + GdkPixbuf *light=getPixbuf(&colors[0], horiz ? PIX_SLIDER_LIGHT : PIX_SLIDER_LIGHT_V, 1.0); + + gdk_draw_pixbuf(window, btn_gcs[0], light, 0, 0, x, y, gdk_pixbuf_get_width(light), + gdk_pixbuf_get_height(light), GDK_RGB_DITHER_MAX, 0, 0); + } } } @@ -4973,13 +5087,18 @@ else qtcurveStyle->menubar_gc[0]=NULL; - if(SHADE_SELECTED==opts.shadeSliders) - memcpy(qtcurveStyle->slider_gc, qtcurveStyle->menuitem_gc, - sizeof(GdkGC *)*(TOTAL_SHADES+1)); - else if(SHADE_NONE!=opts.shadeSliders) - QTC_GEN_GCS(style, qtcurveStyle->slider, qtcurveStyle->slider_gc) - else - qtcurveStyle->slider_gc[0]=NULL; + switch(opts.shadeSliders) + { + case SHADE_SELECTED: + memcpy(qtcurveStyle->slider_gc, qtcurveStyle->menuitem_gc, + sizeof(GdkGC *)*(TOTAL_SHADES+1)); + break; + case SHADE_NONE: + qtcurveStyle->slider_gc[0]=NULL; + break; + default: + QTC_GEN_GCS(style, qtcurveStyle->slider, qtcurveStyle->slider_gc) + } qtcurveStyle->defbtn_gc[0]=NULL; if(IND_COLORED==opts.defBtnIndicator) @@ -5082,17 +5201,24 @@ shadeColors(&color, qtcurveStyle->menubar); } - if(SHADE_SELECTED==opts.shadeSliders) - memcpy(qtcurveStyle->slider, qtcurveStyle->menuitem, sizeof(GdkColor)*(TOTAL_SHADES+1)); - if(SHADE_CUSTOM==opts.shadeSliders) - shadeColors(&opts.customSlidersColor, qtcurveStyle->slider); - else if(SHADE_BLEND_SELECTED==opts.shadeSliders) - { - GdkColor mid; - - generateMidColor(&qtcurveStyle->menuitem[ORIGINAL_SHADE], - &qtcurveStyle->button[ORIGINAL_SHADE], &mid, 1.0); - shadeColors(&mid, qtcurveStyle->slider); + switch(opts.shadeSliders) + { + case SHADE_SELECTED: + memcpy(qtcurveStyle->slider, qtcurveStyle->menuitem, sizeof(GdkColor)*(TOTAL_SHADES+1)); + break; + case SHADE_CUSTOM: + shadeColors(&opts.customSlidersColor, qtcurveStyle->slider); + break; + case SHADE_BLEND_SELECTED: + { + GdkColor mid; + + generateMidColor(&qtcurveStyle->menuitem[ORIGINAL_SHADE], + &qtcurveStyle->button[ORIGINAL_SHADE], &mid, 1.0); + shadeColors(&mid, qtcurveStyle->slider); + } + default: + break; } if(IND_COLORED==opts.defBtnIndicator) @@ -5124,6 +5250,19 @@ shadeColors(&mid, qtcurveStyle->mouseover); } } + + switch(opts.shadeCheckRadio) + { + default: + qtcurveStyle->check_radio=&qtSettings.colors[COLOR_BUTTON_TEXT]; + break; + case SHADE_BLEND_SELECTED: + case SHADE_SELECTED: + qtcurveStyle->check_radio=&qtSettings.colors[COLOR_SELECTED]; + break; + case SHADE_CUSTOM: + qtcurveStyle->check_radio=&opts.customCheckRadioColor; + } } static void qtcurve_style_init_from_rc(GtkStyle *style, GtkRcStyle *rc_style) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qtcurve.h new/QtCurve-Gtk2-0.50/gtk2/qtcurve.h --- old/QtCurve-Gtk2-0.49/gtk2/qtcurve.h 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.50/gtk2/qtcurve.h 2007-05-24 00:22:58.000000000 +0200 @@ -77,7 +77,8 @@ defbtn[TOTAL_SHADES+1], mouseover[TOTAL_SHADES+1], menubar[TOTAL_SHADES+1], - menuitem[TOTAL_SHADES+1]; + menuitem[TOTAL_SHADES+1], + *check_radio; GdkGC *background_gc[TOTAL_SHADES+1], *button_gc[TOTAL_SHADES+1], *slider_gc[TOTAL_SHADES+1], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qt_settings.c new/QtCurve-Gtk2-0.50/gtk2/qt_settings.c --- old/QtCurve-Gtk2-0.49/gtk2/qt_settings.c 2007-05-12 23:12:18.000000000 +0200 +++ new/QtCurve-Gtk2-0.50/gtk2/qt_settings.c 2007-05-24 21:31:14.000000000 +0200 @@ -24,6 +24,8 @@ #include <sys/unistd.h> #include <stdio.h> +#define QTC_DEFAULT_TO_KDE3 /* Should we default to KDE3, or KDE4 settings when not running under KDE? */ + /* #define QTC_DEBUG */ @@ -80,7 +82,8 @@ GTK_APP_OPEN_OFFICE, GTK_APP_VMPLAYER, GTK_APP_GIMP, - GTK_APP_GIMP_PLUGIN + GTK_APP_GIMP_PLUGIN, + GTK_APP_JAVA /*GTK_APP_GAIM*/ } EGtkApp; @@ -125,7 +128,11 @@ if(full && !vers) vers=getenv("KDE_SESSION_VERSION"); +#ifdef QTC_DEFAULT_TO_KDE3 + return !full || (!vers || atoi(vers)<4); +#else return full && (!vers || atoi(vers)<4); +#endif } #ifdef QTC_DO_ICON_MAPPING @@ -1218,11 +1225,13 @@ qtSettings.app=GTK_APP_GIMP_PLUGIN; else if(app==strstr(app, "gimp")) qtSettings.app=GTK_APP_GIMP; + else if(0==strcmp(app, "java")) + qtSettings.app=GTK_APP_JAVA; /*else if(app==strstr(app, "gaim")) qtSettings.app=GTK_APP_GAIM;*/ } - if(GTK_APP_MOZILLA==qtSettings.app) + if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app) { /* KDE's "apply colors to non-KDE apps" messes up firefox! so need to fix this! */ char *kdehome=getKdeHome(); @@ -1416,7 +1425,7 @@ gtk_rc_parse_string("style \"QtCMi\" {xthickness = 1 ythickness = 2 } " "class \"*MenuItem\" style \"QtCMi\""); - if(GTK_APP_MOZILLA==qtSettings.app) + if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app) opts->scrollbarType=SCROLLBAR_WINDOWS; else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0