openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2008
- 1 participants
- 1192 discussions
Hello community,
here is the log from the commit of package qemu
checked in at Mon Aug 4 14:16:08 CEST 2008.
--------
--- qemu/qemu.changes 2008-07-24 13:56:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/qemu/qemu.changes 2008-08-04 13:09:34.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 4 13:08:59 CEST 2008 - ro(a)suse.de
+
+- fix build by adding return statements for two nonvoid functions
+ (qemu-nonvoid_return.patch), actually unreached code
+
+-------------------------------------------------------------------
New:
----
qemu-nonvoid_return.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.E15190/_old 2008-08-04 14:15:58.000000000 +0200
+++ /var/tmp/diff_new_pack.E15190/_new 2008-08-04 14:15:58.000000000 +0200
@@ -18,7 +18,7 @@
Group: System/Emulators/PC
Summary: Universal CPU emulator
Version: 0.9.2svn20080703
-Release: 1
+Release: 2
Source: %name-20080703.tar.bz2
Patch1: qemu-0.9.0.cvs-binfmt.patch
Patch6: qemu-0.7.0-amd64.patch
@@ -50,6 +50,7 @@
Patch86: qemu-svn-ncurses.patch
Patch87: qemu-svn-nodyngen.patch
Patch88: qemu-svn-pcap.patch
+Patch90: qemu-nonvoid_return.patch
Source200: kvm_bios.bin
# this is to make lint happy
Source300: rpmlintrc
@@ -97,6 +98,7 @@
%patch86
%patch87
%patch88
+%patch90
%build
cp -p %SOURCE200 pc-bios/
@@ -163,6 +165,9 @@
%endif
%changelog
+* Mon Aug 04 2008 ro(a)suse.de
+- fix build by adding return statements for two nonvoid functions
+ (qemu-nonvoid_return.patch), actually unreached code
* Thu Jul 24 2008 uli(a)suse.de
- update -> current SVN
- MIPS Magnum R4000 machine (Hervé Poussineau)
++++++ qemu-nonvoid_return.patch ++++++
--- hw/mpcore.c
+++ hw/mpcore.c
@@ -106,6 +106,7 @@
case 12: /* Interrupt status. */
return s->status;
}
+ return 0;
}
static void mpcore_timer_write(mpcore_timer_state *s, int offset,
--- target-m68k/translate.c
+++ target-m68k/translate.c
@@ -452,6 +452,7 @@
default:
qemu_assert(0, "bad operand size");
}
+ return 0;
}
/* Assign value to a register. If the width is less than the register width
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package wpa_supplicant
checked in at Mon Aug 4 13:02:44 CEST 2008.
--------
--- wpa_supplicant/wpa_supplicant.changes 2008-05-05 09:52:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/wpa_supplicant/wpa_supplicant.changes 2008-08-04 12:53:59.804238000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 12:33:10 CEST 2008 - hschaa(a)suse.de
+
+- Remove patches that are already upstream
+- Rebase patches to new version
+- Update to 0.6.3
+
+-------------------------------------------------------------------
Old:
----
wpa_supplicant-0.5.10.tar.bz2
wpa_supplicant-assoc-timeout.patch
wpa_supplicant-fix-deprecated-dbus-function.patch
New:
----
wpa_supplicant-0.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wpa_supplicant.spec ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:32.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package wpa_supplicant (Version 0.5.10)
+# spec file for package wpa_supplicant (Version 0.6.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,8 +17,8 @@
BuildRequires: madwifi-devel
%endif
Url: http://hostap.epitest.fi/wpa_supplicant/
-Version: 0.5.10
-Release: 26
+Version: 0.6.3
+Release: 1
License: BSD 3-Clause; GPL v2 or later
Group: Productivity/Networking/Other
Summary: WPA supplicant implementation
@@ -26,13 +26,11 @@
Source1: config
Source2: %{name}.conf
Source3: fi.epitest.hostap.WPASupplicant.service
-Patch0: wpa_supplicant-assoc-timeout.patch
-Patch1: wpa_supplicant-driver-wext-debug.patch
-Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch
-Patch5: wpa_supplicant-flush-debug-output.patch
-Patch6: wpa_supplicant-sigusr1-changes-debuglevel.patch
-Patch8: wpa_supplicant-dbus-iface-segfault-fix.patch
-Patch9: wpa_supplicant-errormsg.patch
+Patch0: wpa_supplicant-driver-wext-debug.patch
+Patch1: wpa_supplicant-flush-debug-output.patch
+Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch
+Patch3: wpa_supplicant-dbus-iface-segfault-fix.patch
+Patch4: wpa_supplicant-errormsg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,18 +63,17 @@
%prep
%setup -n wpa_supplicant-%{version}
-cp %{SOURCE1} .config
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9
+cp %{SOURCE1} wpa_supplicant/.config
+%patch0 -p2
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
+%patch4 -p2
%build
+cd wpa_supplicant
%ifarch %ix86 x86_64
-echo CONFIG_DRIVER_MADWIFI=y >>.config
+echo CONFIG_DRIVER_MADWIFI=y >> .config
echo "CFLAGS += -I/usr/include/madwifi" >> .config
%endif
CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs}
@@ -86,24 +83,24 @@
%install
install -d %{buildroot}/%{_sbindir}
-install -m 0755 wpa_cli %{buildroot}%{_sbindir}
-install -m 0755 wpa_passphrase %{buildroot}%{_sbindir}
-install -m 0755 wpa_supplicant %{buildroot}%{_sbindir}
+install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir}
+install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir}
+install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir}
install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d
-install -m 0644 dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -m 0644 wpa_supplicant/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
install -d %{buildroot}/%{_sysconfdir}/%{name}
install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_datadir}/dbus-1/system-services
install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services
install -d %{buildroot}/%{_localstatedir}/run/%{name}
install -d %{buildroot}%{_mandir}/man{5,8}
-install -m 0644 doc/docbook/*.8 %{buildroot}%{_mandir}/man8
-install -m 0644 doc/docbook/*.5 %{buildroot}%{_mandir}/man5
-install -m 755 wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
+install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
+install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
+install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
%files
%defattr(-,root,root)
-%doc ChangeLog COPYING README todo.txt doc/wpa_supplicant.fig examples wpa_supplicant.conf
+%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/doc/wpa_supplicant.fig wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
%{_sbindir}/wpa_cli
%{_sbindir}/wpa_passphrase
%{_sbindir}/wpa_supplicant
@@ -120,6 +117,10 @@
/usr/sbin/wpa_gui
%changelog
+* Mon Aug 04 2008 hschaa(a)suse.de
+- Remove patches that are already upstream
+- Rebase patches to new version
+- Update to 0.6.3
* Mon May 05 2008 schwab(a)suse.de
- Fix mangled error message.
* Mon Mar 17 2008 hschaa(a)suse.de
++++++ wpa_supplicant-0.5.10.tar.bz2 -> wpa_supplicant-0.6.3.tar.bz2 ++++++
++++ 283361 lines of diff (skipped)
++++++ wpa_supplicant-dbus-iface-segfault-fix.patch ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200
@@ -1,8 +1,7 @@
-Index: wpa_supplicant-0.5.8/wpa_supplicant.c
-===================================================================
---- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
-+++ wpa_supplicant-0.5.8/wpa_supplicant.c
-@@ -2363,7 +2363,8 @@ static void wpa_supplicant_deinit_iface(
+diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
+--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:40.000000000 +0200
++++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:24.000000000 +0200
+@@ -1818,7 +1818,8 @@
wpa_clear_keys(wpa_s, NULL);
}
++++++ wpa_supplicant-driver-wext-debug.patch ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200
@@ -1,8 +1,7 @@
-Index: wpa_supplicant-0.5.8/driver_wext.c
-===================================================================
---- wpa_supplicant-0.5.8.orig/driver_wext.c
-+++ wpa_supplicant-0.5.8/driver_wext.c
-@@ -1803,20 +1803,32 @@ wpa_driver_wext_associate(void *priv,
+diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c
+--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-02-23 03:45:24.000000000 +0100
++++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:20:37.000000000 +0200
+@@ -2069,20 +2069,32 @@
*/
if (drv->auth_alg_fallback &&
wpa_driver_wext_auth_alg_fallback(drv, params) < 0)
@@ -34,8 +33,8 @@
+}
if (params->wpa_ie == NULL || params->wpa_ie_len == 0)
value = IW_AUTH_WPA_VERSION_DISABLED;
- else if (params->wpa_ie[0] == RSN_INFO_ELEM)
-@@ -1825,26 +1837,41 @@ wpa_driver_wext_associate(void *priv,
+ else if (params->wpa_ie[0] == WLAN_EID_RSN)
+@@ -2091,26 +2103,41 @@
value = IW_AUTH_WPA_VERSION_WPA;
if (wpa_driver_wext_set_auth_param(drv,
IW_AUTH_WPA_VERSION, value) < 0)
@@ -77,7 +76,7 @@
/* Allow unencrypted EAPOL messages even if pairwise keys are set when
* not using WPA. IEEE 802.1X specifies that these frames are not
-@@ -1858,14 +1885,26 @@ wpa_driver_wext_associate(void *priv,
+@@ -2124,14 +2151,26 @@
if (wpa_driver_wext_set_auth_param(drv,
IW_AUTH_RX_UNENCRYPTED_EAPOL,
allow_unencrypted_eapol) < 0)
@@ -104,7 +103,7 @@
return ret;
}
-@@ -1890,6 +1929,8 @@ static int wpa_driver_wext_set_auth_alg(
+@@ -2156,6 +2195,8 @@
res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG,
algs);
drv->auth_alg_fallback = res == -2;
++++++ wpa_supplicant-errormsg.patch ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200
@@ -1,6 +1,7 @@
---- driver_wext.c
-+++ driver_wext.c
-@@ -154,10 +154,12 @@ static int wpa_driver_wext_set_auth_para
+diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c
+--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:26.000000000 +0200
++++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:11.000000000 +0200
+@@ -251,10 +251,12 @@
iwr.u.param.value = value;
if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) {
++++++ wpa_supplicant-flush-debug-output.patch ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200
@@ -1,8 +1,7 @@
-Index: wpa_supplicant-0.5.8/common.c
-===================================================================
---- wpa_supplicant-0.5.8.orig/common.c
-+++ wpa_supplicant-0.5.8/common.c
-@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void)
+diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c
+--- BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-02-23 03:45:24.000000000 +0100
++++ BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-08-04 11:39:05.000000000 +0200
+@@ -39,6 +39,7 @@
if (out_file) {
fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
(unsigned int) tv.usec);
@@ -10,7 +9,7 @@
} else
#endif /* CONFIG_DEBUG_FILE */
printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec);
-@@ -185,6 +186,7 @@ void wpa_printf(int level, char *fmt, ..
+@@ -67,6 +68,7 @@
if (out_file) {
vfprintf(out_file, fmt, ap);
fprintf(out_file, "\n");
@@ -18,7 +17,7 @@
} else {
#endif /* CONFIG_DEBUG_FILE */
vprintf(fmt, ap);
-@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons
+@@ -99,6 +101,7 @@
fprintf(out_file, " [REMOVED]");
}
fprintf(out_file, "\n");
@@ -26,7 +25,7 @@
} else {
#endif /* CONFIG_DEBUG_FILE */
printf("%s - hexdump(len=%lu):", title, (unsigned long) len);
-@@ -262,12 +265,14 @@ static void _wpa_hexdump_ascii(int level
+@@ -144,12 +147,14 @@
fprintf(out_file,
"%s - hexdump_ascii(len=%lu): [REMOVED]\n",
title, (unsigned long) len);
@@ -41,7 +40,7 @@
return;
}
fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
-@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level
+@@ -174,6 +179,7 @@
pos += llen;
len -= llen;
}
++++++ wpa_supplicant-sigusr1-changes-debuglevel.patch ++++++
--- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200
@@ -1,11 +1,10 @@
-Index: wpa_supplicant-0.5.8/wpa_supplicant.c
-===================================================================
---- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
-+++ wpa_supplicant-0.5.8/wpa_supplicant.c
-@@ -931,6 +931,24 @@ static void wpa_supplicant_reconfig(int
+diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
+--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-02-23 03:45:24.000000000 +0100
++++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:43:25.000000000 +0200
+@@ -133,6 +133,22 @@
+ return set;
}
-
+static void wpa_supplicant_handle_sigusr1(int sig, void *eloop_ctx,
+ void *signal_ctx)
+{
@@ -22,12 +21,10 @@
+ ((wpa_debug_level == MSG_DEBUG) ? "DEBUG" :
+ ((wpa_debug_level == MSG_MSGDUMP) ? "MSGDUMP" : "UNKNOWN")));
+}
-+
-+
- static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s)
- {
- struct wpa_ssid *ssid;
-@@ -2570,6 +2588,8 @@ int wpa_supplicant_run(struct wpa_global
+
+ static int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
+@@ -2016,6 +2032,8 @@
eloop_register_signal_terminate(wpa_supplicant_terminate, NULL);
eloop_register_signal_reconfig(wpa_supplicant_reconfig, NULL);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package kde4-filesystem
checked in at Mon Aug 4 13:02:10 CEST 2008.
--------
--- KDE/kde4-filesystem/kde4-filesystem.changes 2008-07-24 11:01:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kde4-filesystem/kde4-filesystem.changes 2008-08-04 08:35:56.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 4 08:35:36 CEST 2008 - dmueller(a)suse.de
+
+- add more icon directories to the filelist
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-filesystem.spec ++++++
--- /var/tmp/diff_new_pack.zK9174/_old 2008-08-04 13:02:04.000000000 +0200
+++ /var/tmp/diff_new_pack.zK9174/_new 2008-08-04 13:02:04.000000000 +0200
@@ -14,7 +14,7 @@
Name: kde4-filesystem
Url: http://www.kde.org
Version: 4.1.0
-Release: 1
+Release: 4
License: LGPL v2.1 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/GUI/KDE
@@ -106,12 +106,17 @@
mkdir -p $RPM_BUILD_ROOT/%_kde_config_dir
mkdir -p $RPM_BUILD_ROOT/usr/share/applications/kde4
for size in scalable 128x128 64x64 48x48 32x32 22x22 16x16; do
- for type in actions apps devices filesystems mimetypes; do
+ for type in actions apps devices filesystems mimetypes status; do
for theme in crystalsvg oxygen hicolor locolor; do
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/$theme/$size/$type
done
done
done
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/small/16x16
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/small/32x32
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/16x16
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/22x22
+ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/48x48
mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4
mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4/libexec
mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4/plugins
@@ -147,6 +152,8 @@
%endif
%changelog
+* Mon Aug 04 2008 dmueller(a)suse.de
+- add more icon directories to the filelist
* Wed Jul 23 2008 dmueller(a)suse.de
- update requires to 4.1.0
* obsolete kde4-korn
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-users
checked in at Mon Aug 4 12:36:47 CEST 2008.
--------
--- yast2-users/yast2-users.changes 2008-07-21 16:10:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-08-04 08:30:50.607219000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 24 15:42:24 CEST 2008 - jsuchome(a)suse.cz
+
+- checkbox to force a change of password (bnc#368613)
+- 2.17.3
+
+-------------------------------------------------------------------
Old:
----
yast2-users-2.17.2.tar.bz2
New:
----
yast2-users-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.Z22984/_old 2008-08-04 12:36:39.000000000 +0200
+++ /var/tmp/diff_new_pack.Z22984/_new 2008-08-04 12:36:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.17.2)
+# spec file for package yast2-users (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,26 +12,25 @@
Name: yast2-users
-Version: 2.17.2
+Version: 2.17.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.17.2.tar.bz2
+Source0: yast2-users-2.17.3.tar.bz2
Prefix: /usr
BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite
Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext
Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user
Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user
-# LDAPInitWithTLSCheck
-Requires: yast2-ldap-client >= 2.15.8
+# this forces using yast2-ldap with orrect LDAP object names (fate#303596)
+Requires: yast2-ldap-client >= 2.17.1
# new ag_anyxml
Requires: yast2 >= 2.16.40
Summary: YaST2 - User and Group Configuration
%description
-This package is required for easy user creation in the YaST2
-installation.
+This package provides GUI for maintenance of linux users and groups.
@@ -46,7 +45,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-users-2.17.2
+%setup -n yast2-users-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +88,9 @@
%{_libdir}/YaST2/plugin/libpy2ag_crack.la
%doc %{prefix}/share/doc/packages/yast2-users
%changelog
+* Thu Jul 24 2008 jsuchome(a)suse.cz
+- checkbox to force a change of password (bnc#368613)
+- 2.17.3
* Mon Jul 21 2008 jsuchome(a)suse.cz
- do not lowecase LDAP object names (fate#303596):
internal user/group keys (not only LDAP) adapted to new schema
++++++ yast2-users-2.17.2.tar.bz2 -> yast2-users-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/cmdline.ycp new/yast2-users-2.17.3/src/cmdline.ycp
--- old/yast2-users-2.17.2/src/cmdline.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/cmdline.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Command line interface functions.
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: cmdline.ycp 44478 2008-02-15 07:34:29Z jsuchome $
+ * $Id: cmdline.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*
* All command line interface functions.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/dialogs.ycp new/yast2-users-2.17.3/src/dialogs.ycp
--- old/yast2-users-2.17.2/src/dialogs.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/dialogs.ycp 2008-07-24 15:43:37.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Johannes Buchhold <jbuch(a)suse.de>,
* Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: dialogs.ycp 47697 2008-05-20 08:43:51Z jsuchome $
+ * $Id: dialogs.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
@@ -622,6 +622,7 @@
define term get_password_term () {
string last_change = GetString (user["shadowLastChange"]:nil, "0");
+ string last_change_label= "";
string expires = GetString (user["shadowExpire"]:nil, "0");
if (expires == "")
expires = "0";
@@ -635,12 +636,12 @@
{
map out = (map)SCR::Execute (.target.bash_output, sformat ("date --date='1970-01-01 00:00:01 %1 days' +\"%%x\"", last_change));
// label (date of last password change)
- last_change = out["stdout"]:_("Unknown");
+ last_change_label = out["stdout"]:_("Unknown");
}
else
{
// label (date of last password change)
- last_change = _("Never");
+ last_change_label = _("Never");
}
if (expires != "0" && expires != "-1" && expires != "")
{
@@ -656,7 +657,13 @@
`HSquash(`VBox(
`Left (`Label (sformat (
// label
- _("Last Password Change: %1"), last_change ))),
+ _("Last Password Change: %1"), last_change_label ))),
+ `VSpacing (0.2),
+ `Left (
+ // check box label
+ `CheckBox (`id (`force_pw), _("Force Password Change"),
+ last_change == "0")
+ ),
`VSpacing (1),
`IntField (`id ("shadowWarning"),
// intfield label
@@ -1480,6 +1487,11 @@
}
}
}
+ if (UI::QueryWidget (`id (`force_pw), `Value) == true)
+ {
+ // force password change
+ user["shadowLastChange"] = "0";
+ }
}
// inside plugins dialog
@@ -1668,6 +1680,11 @@
if (ret == `passwordsettings)
{
UI::ReplaceWidget(`tabContents, get_password_term ());
+ if (GetString (user["shadowLastChange"]:nil, "0") == "0")
+ {
+ // forcing password change cannot be undone
+ UI::ChangeWidget (`id (`force_pw), `Enabled, false);
+ }
Wizard::SetHelpText (EditUserPasswordDialogHelp());
current = ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/helps.ycp new/yast2-users-2.17.3/src/helps.ycp
--- old/yast2-users-2.17.2/src/helps.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/helps.ycp 2008-07-24 15:38:10.000000000 +0200
@@ -470,8 +470,11 @@
* @return string help text
*/
define string EditUserPasswordDialogHelp() ``{
-// Help text 1/5
- return _("<p>
+ // Help text 1/6
+ return _("<p>Activate <b>Force Password Change</b> to force user to change the password at the next login. If <b>Last Password Change</b> is set to <i>Never</i>, user will be forced to change the password.</p>") +
+
+// Help text 2/6
+_("<p>
<b>Days before Password Expiration to Issue Warning</B><BR>
Users can be warned before their passwords expire. Set
how long before expiration the warning should be issued. Set -1 to disable
@@ -479,24 +482,24 @@
</p>
")
+
-// Help text 2/5
+// Help text 3/6
_("<P><B>Days after Password Expires with Usable Login</B><BR>
Users can log in after their passwords have expired. Set how many days to
allow login. Use -1 for unlimited access.
</P>
")
+
-//Help text 3/5
+//Help text 4/6
_("<P><B>Maximum Number of Days for the Same Password</B><BR>Set how many days a user
can use the same password before it expires.</P>
")
+
-// Help text 4/5
+// Help text 5/6
_("<P><B>Minimum Number of Days for the Same Password</B><BR>Set the minimum age of
a password before a user is allowed to change it.</P>
")
+
-// Help text 5/5 : Don't reorder letters YYYY-MM-DD, date must be set in this format
+// Help text 6/6 : Don't reorder letters YYYY-MM-DD, date must be set in this format
_("<P><B>Expiration Date</B><BR>Set the date when this account expires.
The date must be in the format YYYY-MM-DD.
Leave it empty if this account never expires.</P>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/inst_root_first.ycp new/yast2-users-2.17.3/src/inst_root_first.ycp
--- old/yast2-users-2.17.2/src/inst_root_first.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/inst_root_first.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -5,7 +5,7 @@
* Dialog for setting root's password during 1st stage of the installation
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: inst_root_first.ycp 48906 2008-07-08 08:33:36Z jsuchome $
+ * $Id: inst_root_first.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
textdomain "users";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/inst_root.ycp new/yast2-users-2.17.3/src/inst_root.ycp
--- old/yast2-users-2.17.2/src/inst_root.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/inst_root.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -14,7 +14,7 @@
*
* Authors: Klaus K�mpf <kkaempf(a)suse.de>
*
- * $Id: inst_root.ycp 48906 2008-07-08 08:33:36Z jsuchome $
+ * $Id: inst_root.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
textdomain "users";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/inst_user_first.ycp new/yast2-users-2.17.3/src/inst_user_first.ycp
--- old/yast2-users-2.17.2/src/inst_user_first.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/inst_user_first.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialog for creating the first user during installation
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: inst_user_first.ycp 48906 2008-07-08 08:33:36Z jsuchome $
+ * $Id: inst_user_first.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
import "Arch";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/inst_user.ycp new/yast2-users-2.17.3/src/inst_user.ycp
--- old/yast2-users-2.17.2/src/inst_user.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/inst_user.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: Start user management module from within installation workflow
*
- * $Id: inst_user.ycp 48413 2008-06-19 08:16:54Z jsuchome $
+ * $Id: inst_user.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/users_auto.ycp new/yast2-users-2.17.3/src/users_auto.ycp
--- old/yast2-users-2.17.2/src/users_auto.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/users_auto.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif <nashif(a)suse.de>
*
- * $Id: users_auto.ycp 20592 2004-12-17 09:35:25Z jsuchome $
+ * $Id: users_auto.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/users_plugin_ldap_all.ycp new/yast2-users-2.17.3/src/users_plugin_ldap_all.ycp
--- old/yast2-users-2.17.2/src/users_plugin_ldap_all.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/users_plugin_ldap_all.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: users_plugin_ldap_all.ycp 45728 2008-03-26 09:56:17Z jsuchome $
+ * $Id: users_plugin_ldap_all.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/users_plugin_ldap_shadowaccount.ycp new/yast2-users-2.17.3/src/users_plugin_ldap_shadowaccount.ycp
--- old/yast2-users-2.17.2/src/users_plugin_ldap_shadowaccount.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/users_plugin_ldap_shadowaccount.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: users_plugin_ldap_shadowaccount.ycp 45728 2008-03-26 09:56:17Z jsuchome $
+ * $Id: users_plugin_ldap_shadowaccount.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/Users.pm new/yast2-users-2.17.3/src/Users.pm
--- old/yast2-users-2.17.2/src/Users.pm 2008-07-21 15:17:24.000000000 +0200
+++ new/yast2-users-2.17.3/src/Users.pm 2008-07-21 16:08:42.000000000 +0200
@@ -4,7 +4,7 @@
# Package: Configuration of users and groups
# Summary: I/O routines + main data structures
#
-# $Id: Users.pm 47757 2008-05-21 12:37:23Z jsuchome $
+# $Id: Users.pm 49295 2008-07-21 14:10:36Z jsuchome $
#
package Users;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/users_proposal.ycp new/yast2-users-2.17.3/src/users_proposal.ycp
--- old/yast2-users-2.17.2/src/users_proposal.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/users_proposal.ycp 2008-08-01 11:59:47.000000000 +0200
@@ -3,7 +3,7 @@
* Author: Jiri Suchomel <jsuchome(a)suse.cz>
* Purpose: Proposal for user and root setting
*
- * $Id: users_proposal.ycp 46588 2008-04-14 14:06:23Z jsuchome $
+ * $Id: users_proposal.ycp 49567 2008-08-01 10:01:55Z jsuchome $
*/
{
textdomain "users";
@@ -94,7 +94,7 @@
if (UsersSimple::EncryptionMethod () != "blowfish")
{
// summary line
- rest = sformat (_("Password Encrypttion Method: %1"),
+ rest = sformat (_("Password Encryption Method: %1"),
encoding2label[UsersSimple::EncryptionMethod ()]:"");
}
ret = $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/src/widgets.ycp new/yast2-users-2.17.3/src/widgets.ycp
--- old/yast2-users-2.17.2/src/widgets.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.3/src/widgets.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets definitions and helper functions
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: widgets.ycp 45217 2008-03-05 14:52:46Z jsuchome $
+ * $Id: widgets.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/testsuite/tests/ConvertMap.ycp new/yast2-users-2.17.3/testsuite/tests/ConvertMap.ycp
--- old/yast2-users-2.17.2/testsuite/tests/ConvertMap.ycp 2008-07-21 14:39:31.000000000 +0200
+++ new/yast2-users-2.17.3/testsuite/tests/ConvertMap.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -1,7 +1,7 @@
/**
* Test for UsersLDAP::ConvertMap
* Author: Jiri Suchomel <jsuchome(a)suse.cz>
- * $Id: ConvertMap.ycp 25712 2005-09-29 14:20:52Z jsuchome $
+ * $Id: ConvertMap.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
// testedfiles: Users.pm UsersLDAP.pm
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/testsuite/tests/EditUser.ycp new/yast2-users-2.17.3/testsuite/tests/EditUser.ycp
--- old/yast2-users-2.17.2/testsuite/tests/EditUser.ycp 2008-07-21 14:38:07.000000000 +0200
+++ new/yast2-users-2.17.3/testsuite/tests/EditUser.ycp 2008-07-21 16:08:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary : Test of Users::EditUser function
* Author : Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: EditUser.ycp 42127 2007-11-16 14:30:35Z jsuchome $
+ * $Id: EditUser.ycp 49295 2008-07-21 14:10:36Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.2/VERSION new/yast2-users-2.17.3/VERSION
--- old/yast2-users-2.17.2/VERSION 2008-07-21 14:15:37.000000000 +0200
+++ new/yast2-users-2.17.3/VERSION 2008-07-24 15:42:49.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xorg-x11-driver-input
checked in at Mon Aug 4 12:36:29 CEST 2008.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2008-07-30 18:29:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2008-08-04 11:49:07.822643642 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 11:47:26 CEST 2008 - sndirsch(a)suse.de
+
+- updated fpit driver to git commit e8620e9
+ * Check for XINPUT ABI 3; possibly addresses bnc #381278
+- obsoletes xf86-input-fpit-commmit-95676d8.diff
+
+-------------------------------------------------------------------
Old:
----
xf86-input-fpit-1.2.0.tar.bz2
xf86-input-fpit-commmit-95676d8.diff
New:
----
xf86-input-fpit-1.2.0_e8620e9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.c19890/_old 2008-08-04 12:35:27.000000000 +0200
+++ /var/tmp/diff_new_pack.c19890/_new 2008-08-04 12:35:27.000000000 +0200
@@ -16,7 +16,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 110
+Release: 113
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -32,7 +32,7 @@
Source7: xf86-input-elo2300-1.1.2.tar.bz2
Source8: xf86-input-elographics-1.2.2.tar.bz2
Source9: xf86-input-evdev-1.1.5.tar.bz2
-Source10: xf86-input-fpit-1.2.0.tar.bz2
+Source10: xf86-input-fpit-1.2.0_e8620e9.tar.bz2
Source11: xf86-input-hyperpen-1.2.0.tar.bz2
Source12: xf86-input-jamstudio-1.2.0.tar.bz2
Source13: xf86-input-joystick-1.3.2.tar.bz2
@@ -60,7 +60,6 @@
Patch7: xf86-input-evdev-commit-eeb3727.diff
Patch11: xf86-input-evdev-max_fixes.diff
Patch12: zap_warning_kbd.diff
-Patch13: xf86-input-fpit-commmit-95676d8.diff
Patch14: xf86-input-vmmouse.diff
%description
@@ -91,9 +90,6 @@
pushd xf86-input-aiptek-*/src
tar xzf %{S:100}
popd
-pushd xf86-input-fpit-*
-%patch13 -p1
-popd
pushd xf86-input-vmmouse-*
%patch14 -p0
popd
@@ -138,6 +134,10 @@
%{_mandir}/man4/*
%changelog
+* Mon Aug 04 2008 sndirsch(a)suse.de
+- updated fpit driver to git commit e8620e9
+ * Check for XINPUT ABI 3; possibly addresses bnc #381278
+- obsoletes xf86-input-fpit-commmit-95676d8.diff
* Wed Jul 30 2008 sndirsch(a)suse.de
- xf86-input-vmmouse.diff
* make sure to call conversion_proc from within the driver, as
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package qtcurve-kde4
checked in at Mon Aug 4 12:34:14 CEST 2008.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2008-07-21 10:28:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2008-08-04 01:21:40.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 4 01:20:59 CEST 2008 - dmueller(a)suse.de
+
+- update to 0.59.6:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+ * Fix some drawing issues with menuitems and NVIDIA.
+ * 'Fix' Skype's menu buttons.
+ * Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE4-0.59.5.tar.bz2
New:
----
QtCurve-KDE4-0.59.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.S15128/_old 2008-08-04 12:34:09.000000000 +0200
+++ /var/tmp/diff_new_pack.S15128/_new 2008-08-04 12:34:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.59.5)
+# spec file for package qtcurve-kde4 (Version 0.59.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,7 +17,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE 4
-Version: 0.59.5
+Version: 0.59.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.bz2
@@ -59,6 +59,13 @@
%_kde_share_dir/apps/color-schemes/QtCurve.colors
%changelog
+* Mon Aug 04 2008 dmueller(a)suse.de
+- update to 0.59.6:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+ * Fix some drawing issues with menuitems and NVIDIA.
+ * 'Fix' Skype's menu buttons.
+ * Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
* Mon Jul 21 2008 stbinner(a)suse.de
- update to 0.59.5:
* Fix corners of scrolbars in plasma 4.1's folderview.
++++++ QtCurve-KDE4-0.59.5.tar.bz2 -> QtCurve-KDE4-0.59.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/ChangeLog new/QtCurve-KDE4-0.59.6/ChangeLog
--- old/QtCurve-KDE4-0.59.5/ChangeLog 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/ChangeLog 2008-07-30 21:18:43.000000000 +0200
@@ -1,3 +1,11 @@
+0.59.6
+------
+1. In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+2. Fix some drawing issues with menuitems and NVIDIA.
+3. 'Fix' Skype's menu buttons.
+4. Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
+
0.59.5
------
1. Fix corners of scrolbars in plasma 4.1's folderview.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/CMakeLists.txt new/QtCurve-KDE4-0.59.6/CMakeLists.txt
--- old/QtCurve-KDE4-0.59.5/CMakeLists.txt 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/CMakeLists.txt 2008-07-30 21:18:43.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "59")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_PATCH "6")
set(CPACK_PACKAGE_CONTACT "Craig Drummond <Craig.Drummond(a)lycos.co.uk>")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/config/qtcurveconfigbase.ui new/QtCurve-KDE4-0.59.6/config/qtcurveconfigbase.ui
--- old/QtCurve-KDE4-0.59.5/config/qtcurveconfigbase.ui 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/config/qtcurveconfigbase.ui 2008-07-30 21:18:43.000000000 +0200
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>704</width>
- <height>554</height>
+ <width>733</width>
+ <height>556</height>
</rect>
</property>
<property name="windowTitle" >
@@ -32,6 +32,33 @@
</property>
</widget>
</item>
+ <item row="1" column="0" >
+ <widget class="QTreeWidget" name="stackList" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="indentation" >
+ <number>0</number>
+ </property>
+ <property name="rootIsDecorated" >
+ <bool>false</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Category</string>
+ </property>
+ </column>
+ </widget>
+ </item>
<item rowspan="2" row="1" column="1" >
<widget class="QStackedWidget" name="stack" >
<property name="sizePolicy" >
@@ -44,6 +71,14 @@
<number>0</number>
</property>
<widget class="QWidget" name="page" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_7" >
@@ -70,7 +105,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -167,7 +202,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -178,6 +213,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_2" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_10" >
@@ -194,7 +237,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -207,7 +250,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -218,6 +261,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_3" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_11" >
@@ -265,7 +316,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -336,7 +387,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -347,7 +398,15 @@
</layout>
</widget>
<widget class="QWidget" name="page_4" >
- <layout class="QGridLayout" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_16" >
<property name="text" >
@@ -369,13 +428,23 @@
</widget>
</item>
<item row="0" column="4" >
- <spacer>
+ <widget class="QCheckBox" name="fillProgress" >
+ <property name="whatsThis" >
+ <string>Enable this option to remove the 1 pixel border around the filled element.</string>
+ </property>
+ <property name="text" >
+ <string>No border</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5" >
+ <spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
- <width>40</width>
+ <width>118</width>
<height>20</height>
</size>
</property>
@@ -394,19 +463,25 @@
<item row="1" column="2" >
<widget class="QComboBox" name="progressGrooveColor" />
</item>
- <item row="1" column="3" >
- <widget class="QCheckBox" name="fillProgress" >
- <property name="text" >
- <string>Fill</string>
+ <item row="1" column="3" colspan="3" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -417,6 +492,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_5" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="embolden" >
@@ -430,7 +513,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -453,7 +536,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -464,6 +547,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_6" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_18" >
@@ -480,7 +571,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -513,7 +604,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -524,6 +615,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_7" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_19" >
@@ -540,7 +639,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -576,7 +675,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -587,6 +686,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_15" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QCheckBox" name="gtkScrollViews" >
@@ -621,7 +728,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -632,6 +739,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_8" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_20" >
@@ -665,7 +780,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -688,7 +803,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -699,6 +814,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_9" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_22" >
@@ -722,7 +845,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -749,7 +872,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -760,6 +883,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_10" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_23" >
@@ -776,7 +907,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -789,7 +920,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -800,6 +931,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_11" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_4" >
@@ -832,7 +971,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>342</width>
<height>24</height>
@@ -986,22 +1125,10 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
+ <property name="margin" >
<number>11</number>
</property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
+ <property name="spacing" >
<number>6</number>
</property>
<item row="0" column="4" >
@@ -1009,7 +1136,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -1054,7 +1181,7 @@
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>83</width>
<height>21</height>
@@ -1065,6 +1192,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_12" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="4" >
<widget class="QCheckBox" name="gtkComboMenus" >
@@ -1146,7 +1281,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -1159,7 +1294,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>261</height>
@@ -1170,6 +1305,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_13" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QComboBox" name="gradCombo" />
@@ -1275,7 +1418,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>143</width>
<height>20</height>
@@ -1357,6 +1500,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_14" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
@@ -1478,7 +1629,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>16</height>
@@ -1494,7 +1645,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>104</height>
@@ -1513,33 +1664,6 @@
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QTreeWidget" name="stackList" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <property name="indentation" >
- <number>0</number>
- </property>
- <property name="rootIsDecorated" >
- <bool>false</bool>
- </property>
- <column>
- <property name="text" >
- <string>Category</string>
- </property>
- </column>
- </widget>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
@@ -1588,9 +1712,9 @@
<tabstop>progressAppearance</tabstop>
<tabstop>stripedProgress</tabstop>
<tabstop>animatedProgress</tabstop>
+ <tabstop>fillProgress</tabstop>
<tabstop>progressGrooveAppearance</tabstop>
<tabstop>progressGrooveColor</tabstop>
- <tabstop>fillProgress</tabstop>
<tabstop>embolden</tabstop>
<tabstop>defBtnIndicator</tabstop>
<tabstop>coloredMouseOver</tabstop>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/style/qtcurve.cpp new/QtCurve-KDE4-0.59.6/style/qtcurve.cpp
--- old/QtCurve-KDE4-0.59.5/style/qtcurve.cpp 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/style/qtcurve.cpp 2008-07-30 21:18:43.000000000 +0200
@@ -31,6 +31,7 @@
#endif
#ifdef QTC_USE_KDE4
+#include <KDE/KApplication>
#include <KDE/KGlobalSettings>
#include <KDE/KConfig>
#include <KDE/KConfigGroup>
@@ -41,6 +42,11 @@
static KComponentData *theKComponentData=0;
static int theInstanceCount=0;
+inline bool kdeApp()
+{
+ return kapp && !theKComponentData && !KGlobal::hasMainComponent();
+}
+
static void checkKComponentData()
{
if(!theKComponentData && !KGlobal::hasMainComponent())
@@ -264,6 +270,7 @@
APP_KRUNNER,
APP_KWIN,
APP_SYSTEMSETTINGS,
+ APP_SKYPE,
APP_OTHER
} theThemedApp=APP_OTHER;
@@ -929,6 +936,7 @@
#if !defined QTC_DISABLE_KDEFILEDIALOG_CALLS
setFileDialogs();
#endif
+ QTimer::singleShot(0, this, SLOT(setupKde4()));
#endif
QString rcFile;
@@ -1087,6 +1095,8 @@
theThemedApp=APP_PLASMA;
else if("krunner"==appName)
theThemedApp=APP_KRUNNER;
+ else if("skype"==appName)
+ theThemedApp=APP_SKYPE;
}
void QtCurveStyle::polish(QPalette &palette)
@@ -1870,8 +1880,7 @@
#endif
#ifdef QTC_USE_KDE4
case SH_DialogButtonBox_ButtonsHaveIcons:
- checkKComponentData();
- return KGlobalSettings::showIconsOnPushButtons();
+ return kdeApp() && KGlobalSettings::showIconsOnPushButtons();
case SH_ItemView_ActivateItemOnSingleClick:
checkKComponentData();
return KGlobalSettings::singleClick();
@@ -1891,142 +1900,143 @@
QPixmap QtCurveStyle::standardPixmap(StandardPixmap pix, const QStyleOption *option, const QWidget *widget) const
{
#ifdef QTC_USE_KDE4
- checkKComponentData();
-
- bool fd(widget && qobject_cast<const QFileDialog *>(widget));
-
- switch(pix)
+ if(kdeApp())
{
-// case SP_TitleBarMenuButton:
-// case SP_TitleBarMinButton:
-// case SP_TitleBarMaxButton:
-// case SP_TitleBarCloseButton:
-// case SP_TitleBarNormalButton:
-// case SP_TitleBarShadeButton:
-// case SP_TitleBarUnshadeButton:
-// case SP_TitleBarContextHelpButton:
-// case SP_DockWidgetCloseButton:
- case SP_MessageBoxInformation:
- return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
- case SP_MessageBoxWarning:
- return KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::Dialog, 32);
- case SP_MessageBoxCritical:
- return KIconLoader::global()->loadIcon("dialog-error", KIconLoader::Dialog, 32);
- case SP_MessageBoxQuestion:
- return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
-// case SP_DesktopIcon:
-// return KIconLoader::global()->loadIcon("user-desktop", KIconLoader::Small, 16);
-// case SP_TrashIcon:
-// return KIconLoader::global()->loadIcon("user-trash", KIconLoader::Small, 16);
-// case SP_ComputerIcon:
-// return KIconLoader::global()->loadIcon("computer", KIconLoader::Small, 16);
-// case SP_DriveFDIcon:
-// return KIconLoader::global()->loadIcon("media-floppy", KIconLoader::Small, 16);
-// case SP_DriveHDIcon:
-// return KIconLoader::global()->loadIcon("drive-harddisk", KIconLoader::Small, 16);
-// case SP_DriveCDIcon:
-// case SP_DriveDVDIcon:
-// return KIconLoader::global()->loadIcon("media-optical", KIconLoader::Small, 16);
-// case SP_DriveNetIcon:
-// return KIconLoader::global()->loadIcon("network-server", KIconLoader::Small, 16);
-// case SP_DirOpenIcon:
-// return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
-// case SP_DirIcon:
-// case SP_DirClosedIcon:
-// return KIconLoader::global()->loadIcon("folder", KIconLoader::Small, 16);
-// case SP_DirLinkIcon:
-// case SP_FileIcon:
-// return KIconLoader::global()->loadIcon("application-x-zerosize", KIconLoader::Small, 16);
-// case SP_FileLinkIcon:
-// case SP_ToolBarHorizontalExtensionButton:
-// case SP_ToolBarVerticalExtensionButton:
- case SP_FileDialogStart:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-edn" : "go-first", KIconLoader::Small, 16);
- case SP_FileDialogEnd:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-first" : "go-end", KIconLoader::Small, 16);
- case SP_FileDialogToParent:
- return KIconLoader::global()->loadIcon("go-up", KIconLoader::Small, 16);
- case SP_FileDialogNewFolder:
- return KIconLoader::global()->loadIcon("folder-new", KIconLoader::Small, 16);
- case SP_FileDialogDetailedView:
- return KIconLoader::global()->loadIcon("view-list-details", KIconLoader::Small, 16);
-// case SP_FileDialogInfoView:
-// return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
-// case SP_FileDialogContentsView:
-// return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_FileDialogListView:
- return KIconLoader::global()->loadIcon("view-list-icons", KIconLoader::Small, 16);
- case SP_FileDialogBack:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous", KIconLoader::Small, 16);
- case SP_DialogOkButton:
- return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_DialogCancelButton:
- return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_DialogHelpButton:
- return KIconLoader::global()->loadIcon("help-contents", KIconLoader::Small, 16);
- case SP_DialogOpenButton:
- return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
- case SP_DialogSaveButton:
- return KIconLoader::global()->loadIcon("document-save", KIconLoader::Small, 16);
- case SP_DialogCloseButton:
- return KIconLoader::global()->loadIcon("dialog-close", KIconLoader::Small, 16);
- case SP_DialogApplyButton:
- return KIconLoader::global()->loadIcon("dialog-ok-apply", KIconLoader::Small, 16);
- case SP_DialogResetButton:
- return KIconLoader::global()->loadIcon("document-revert", KIconLoader::Small, 16);
-// case SP_DialogDiscardButton:
-// return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_DialogYesButton:
- return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_DialogNoButton:
- return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_ArrowUp:
- return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Dialog, 32);
- case SP_ArrowDown:
- return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Dialog, 32);
- case SP_ArrowLeft:
- return KIconLoader::global()->loadIcon("arrow-left", KIconLoader::Dialog, 32);
- case SP_ArrowRight:
- return KIconLoader::global()->loadIcon("arrow-right", KIconLoader::Dialog, 32);
- case SP_ArrowBack:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? (fd ? "go-next" : "arrow-right")
- : (fd ? "go-previous" : "arrow-left"), KIconLoader::Dialog, 32);
- case SP_ArrowForward:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? (fd ? "go-previous" : "arrow-left")
- : (fd ? "go-next" : "arrow-right"), KIconLoader::Dialog, 32);
-// case SP_DirHomeIcon:
-// return KIconLoader::global()->loadIcon("user-home", KIconLoader::Small, 16);
-// case SP_CommandLink:
-// case SP_VistaShield:
- case SP_BrowserReload:
- return KIconLoader::global()->loadIcon("view-refresh", KIconLoader::Small, 16);
- case SP_BrowserStop:
- return KIconLoader::global()->loadIcon("process-stop", KIconLoader::Small, 16);
- case SP_MediaPlay:
- return KIconLoader::global()->loadIcon("media-playback-start", KIconLoader::Small, 16);
- case SP_MediaStop:
- return KIconLoader::global()->loadIcon("media-playback-stop", KIconLoader::Small, 16);
- case SP_MediaPause:
- return KIconLoader::global()->loadIcon("media-playback-pause", KIconLoader::Small, 16);
- case SP_MediaSkipForward:
- return KIconLoader::global()->loadIcon("media-skip-forward", KIconLoader::Small, 16);
- case SP_MediaSkipBackward:
- return KIconLoader::global()->loadIcon("media-skip-backward", KIconLoader::Small, 16);
- case SP_MediaSeekForward:
- return KIconLoader::global()->loadIcon("media-seek-forward", KIconLoader::Small, 16);
- case SP_MediaSeekBackward:
- return KIconLoader::global()->loadIcon("media-seek-backward", KIconLoader::Small, 16);
- case SP_MediaVolume:
- return KIconLoader::global()->loadIcon("player-volume", KIconLoader::Small, 16);
- case SP_MediaVolumeMuted:
- return KIconLoader::global()->loadIcon("player-volume-muted", KIconLoader::Small, 16);
- default:
- break;
+ bool fd(widget && qobject_cast<const QFileDialog *>(widget));
+
+ switch(pix)
+ {
+ // case SP_TitleBarMenuButton:
+ // case SP_TitleBarMinButton:
+ // case SP_TitleBarMaxButton:
+ // case SP_TitleBarCloseButton:
+ // case SP_TitleBarNormalButton:
+ // case SP_TitleBarShadeButton:
+ // case SP_TitleBarUnshadeButton:
+ // case SP_TitleBarContextHelpButton:
+ // case SP_DockWidgetCloseButton:
+ case SP_MessageBoxInformation:
+ return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
+ case SP_MessageBoxWarning:
+ return KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::Dialog, 32);
+ case SP_MessageBoxCritical:
+ return KIconLoader::global()->loadIcon("dialog-error", KIconLoader::Dialog, 32);
+ case SP_MessageBoxQuestion:
+ return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
+ // case SP_DesktopIcon:
+ // return KIconLoader::global()->loadIcon("user-desktop", KIconLoader::Small, 16);
+ // case SP_TrashIcon:
+ // return KIconLoader::global()->loadIcon("user-trash", KIconLoader::Small, 16);
+ // case SP_ComputerIcon:
+ // return KIconLoader::global()->loadIcon("computer", KIconLoader::Small, 16);
+ // case SP_DriveFDIcon:
+ // return KIconLoader::global()->loadIcon("media-floppy", KIconLoader::Small, 16);
+ // case SP_DriveHDIcon:
+ // return KIconLoader::global()->loadIcon("drive-harddisk", KIconLoader::Small, 16);
+ // case SP_DriveCDIcon:
+ // case SP_DriveDVDIcon:
+ // return KIconLoader::global()->loadIcon("media-optical", KIconLoader::Small, 16);
+ // case SP_DriveNetIcon:
+ // return KIconLoader::global()->loadIcon("network-server", KIconLoader::Small, 16);
+ // case SP_DirOpenIcon:
+ // return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
+ // case SP_DirIcon:
+ // case SP_DirClosedIcon:
+ // return KIconLoader::global()->loadIcon("folder", KIconLoader::Small, 16);
+ // case SP_DirLinkIcon:
+ // case SP_FileIcon:
+ // return KIconLoader::global()->loadIcon("application-x-zerosize", KIconLoader::Small, 16);
+ // case SP_FileLinkIcon:
+ // case SP_ToolBarHorizontalExtensionButton:
+ // case SP_ToolBarVerticalExtensionButton:
+ case SP_FileDialogStart:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-edn" : "go-first", KIconLoader::Small, 16);
+ case SP_FileDialogEnd:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-first" : "go-end", KIconLoader::Small, 16);
+ case SP_FileDialogToParent:
+ return KIconLoader::global()->loadIcon("go-up", KIconLoader::Small, 16);
+ case SP_FileDialogNewFolder:
+ return KIconLoader::global()->loadIcon("folder-new", KIconLoader::Small, 16);
+ case SP_FileDialogDetailedView:
+ return KIconLoader::global()->loadIcon("view-list-details", KIconLoader::Small, 16);
+ // case SP_FileDialogInfoView:
+ // return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ // case SP_FileDialogContentsView:
+ // return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_FileDialogListView:
+ return KIconLoader::global()->loadIcon("view-list-icons", KIconLoader::Small, 16);
+ case SP_FileDialogBack:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous", KIconLoader::Small, 16);
+ case SP_DialogOkButton:
+ return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_DialogCancelButton:
+ return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_DialogHelpButton:
+ return KIconLoader::global()->loadIcon("help-contents", KIconLoader::Small, 16);
+ case SP_DialogOpenButton:
+ return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
+ case SP_DialogSaveButton:
+ return KIconLoader::global()->loadIcon("document-save", KIconLoader::Small, 16);
+ case SP_DialogCloseButton:
+ return KIconLoader::global()->loadIcon("dialog-close", KIconLoader::Small, 16);
+ case SP_DialogApplyButton:
+ return KIconLoader::global()->loadIcon("dialog-ok-apply", KIconLoader::Small, 16);
+ case SP_DialogResetButton:
+ return KIconLoader::global()->loadIcon("document-revert", KIconLoader::Small, 16);
+ // case SP_DialogDiscardButton:
+ // return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_DialogYesButton:
+ return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_DialogNoButton:
+ return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_ArrowUp:
+ return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Dialog, 32);
+ case SP_ArrowDown:
+ return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Dialog, 32);
+ case SP_ArrowLeft:
+ return KIconLoader::global()->loadIcon("arrow-left", KIconLoader::Dialog, 32);
+ case SP_ArrowRight:
+ return KIconLoader::global()->loadIcon("arrow-right", KIconLoader::Dialog, 32);
+ case SP_ArrowBack:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? (fd ? "go-next" : "arrow-right")
+ : (fd ? "go-previous" : "arrow-left"), KIconLoader::Dialog, 32);
+ case SP_ArrowForward:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? (fd ? "go-previous" : "arrow-left")
+ : (fd ? "go-next" : "arrow-right"), KIconLoader::Dialog, 32);
+ // case SP_DirHomeIcon:
+ // return KIconLoader::global()->loadIcon("user-home", KIconLoader::Small, 16);
+ // case SP_CommandLink:
+ // case SP_VistaShield:
+ case SP_BrowserReload:
+ return KIconLoader::global()->loadIcon("view-refresh", KIconLoader::Small, 16);
+ case SP_BrowserStop:
+ return KIconLoader::global()->loadIcon("process-stop", KIconLoader::Small, 16);
+ case SP_MediaPlay:
+ return KIconLoader::global()->loadIcon("media-playback-start", KIconLoader::Small, 16);
+ case SP_MediaStop:
+ return KIconLoader::global()->loadIcon("media-playback-stop", KIconLoader::Small, 16);
+ case SP_MediaPause:
+ return KIconLoader::global()->loadIcon("media-playback-pause", KIconLoader::Small, 16);
+ case SP_MediaSkipForward:
+ return KIconLoader::global()->loadIcon("media-skip-forward", KIconLoader::Small, 16);
+ case SP_MediaSkipBackward:
+ return KIconLoader::global()->loadIcon("media-skip-backward", KIconLoader::Small, 16);
+ case SP_MediaSeekForward:
+ return KIconLoader::global()->loadIcon("media-seek-forward", KIconLoader::Small, 16);
+ case SP_MediaSeekBackward:
+ return KIconLoader::global()->loadIcon("media-seek-backward", KIconLoader::Small, 16);
+ case SP_MediaVolume:
+ return KIconLoader::global()->loadIcon("player-volume", KIconLoader::Small, 16);
+ case SP_MediaVolumeMuted:
+ return KIconLoader::global()->loadIcon("player-volume-muted", KIconLoader::Small, 16);
+ default:
+ break;
+ }
}
#endif
return QTC_BASE_STYLE::standardPixmap(pix, option, widget);
@@ -2035,139 +2045,140 @@
QIcon QtCurveStyle::standardIconImplementation(StandardPixmap pix, const QStyleOption *option, const QWidget *widget) const
{
#ifdef QTC_USE_KDE4
- checkKComponentData();
-
- switch(pix)
+ if(kdeApp())
{
-// case SP_TitleBarMenuButton:
-// case SP_TitleBarMinButton:
-// case SP_TitleBarMaxButton:
-// case SP_TitleBarCloseButton:
-// case SP_TitleBarNormalButton:
-// case SP_TitleBarShadeButton:
-// case SP_TitleBarUnshadeButton:
-// case SP_TitleBarContextHelpButton:
-// case SP_DockWidgetCloseButton:
- case SP_MessageBoxInformation:
- return KIcon("dialog-information");
- case SP_MessageBoxWarning:
- return KIcon("dialog-warning");
- case SP_MessageBoxCritical:
- return KIcon("dialog-error");
- case SP_MessageBoxQuestion:
- return KIcon("dialog-information");
-// case SP_DesktopIcon:
-// return KIcon("user-desktop");
-// case SP_TrashIcon:
-// return KIcon("user-trash");
-// case SP_ComputerIcon:
-// return KIcon("computer");
-// case SP_DriveFDIcon:
-// return KIcon("media-floppy");
-// case SP_DriveHDIcon:
-// return KIcon("drive-harddisk");
-// case SP_DriveCDIcon:
-// case SP_DriveDVDIcon:
-// return KIcon("media-optical");
-// case SP_DriveNetIcon:
-// return KIcon("network-server");
-// case SP_DirOpenIcon:
-// return KIcon("document-open");
-// case SP_DirIcon:
-// case SP_DirClosedIcon:
-// return KIcon("folder");
-// case SP_DirLinkIcon:
-// case SP_FileIcon:
-// return KIcon("application-x-zerosize");
-// case SP_FileLinkIcon:
-// case SP_ToolBarHorizontalExtensionButton:
-// case SP_ToolBarVerticalExtensionButton:
- case SP_FileDialogStart:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-edn" : "go-first");
- case SP_FileDialogEnd:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-first" : "go-end");
- case SP_FileDialogToParent:
- return KIcon("go-up");
- case SP_FileDialogNewFolder:
- return KIcon("folder-new");
- case SP_FileDialogDetailedView:
- return KIcon("view-list-details");
-// case SP_FileDialogInfoView:
-// return KIcon("dialog-ok");
-// case SP_FileDialogContentsView:
-// return KIcon("dialog-ok");
- case SP_FileDialogListView:
- return KIcon("view-list-icons");
- case SP_FileDialogBack:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous");
- case SP_DialogOkButton:
- return KIcon("dialog-ok");
- case SP_DialogCancelButton:
- return KIcon("dialog-cancel");
- case SP_DialogHelpButton:
- return KIcon("help-contents");
- case SP_DialogOpenButton:
- return KIcon("document-open");
- case SP_DialogSaveButton:
- return KIcon("document-save");
- case SP_DialogCloseButton:
- return KIcon("dialog-close");
- case SP_DialogApplyButton:
- return KIcon("dialog-ok-apply");
- case SP_DialogResetButton:
- return KIcon("document-revert");
-// case SP_DialogDiscardButton:
-// return KIcon("dialog-cancel");
- case SP_DialogYesButton:
- return KIcon("dialog-ok");
- case SP_DialogNoButton:
- return KIcon("dialog-cancel");
- case SP_ArrowUp:
- return KIcon("arrow-up");
- case SP_ArrowDown:
- return KIcon("arrow-down");
- case SP_ArrowLeft:
- return KIcon("arrow-left");
- case SP_ArrowRight:
- return KIcon("arrow-right");
- case SP_ArrowBack:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous");
- case SP_ArrowForward:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-previous"
- : "go-next");
-// case SP_DirHomeIcon:
-// return KIcon("user-home");
-// case SP_CommandLink:
-// case SP_VistaShield:
- case SP_BrowserReload:
- return KIcon("view-refresh");
- case SP_BrowserStop:
- return KIcon("process-stop");
- case SP_MediaPlay:
- return KIcon("media-playback-start");
- case SP_MediaStop:
- return KIcon("media-playback-stop");
- case SP_MediaPause:
- return KIcon("media-playback-pause");
- case SP_MediaSkipForward:
- return KIcon("media-skip-forward");
- case SP_MediaSkipBackward:
- return KIcon("media-skip-backward");
- case SP_MediaSeekForward:
- return KIcon("media-seek-forward");
- case SP_MediaSeekBackward:
- return KIcon("media-seek-backward");
- case SP_MediaVolume:
- return KIcon("player-volume");
- case SP_MediaVolumeMuted:
- return KIcon("player-volume-muted");
- default:
- break;
+ switch(pix)
+ {
+ // case SP_TitleBarMenuButton:
+ // case SP_TitleBarMinButton:
+ // case SP_TitleBarMaxButton:
+ // case SP_TitleBarCloseButton:
+ // case SP_TitleBarNormalButton:
+ // case SP_TitleBarShadeButton:
+ // case SP_TitleBarUnshadeButton:
+ // case SP_TitleBarContextHelpButton:
+ // case SP_DockWidgetCloseButton:
+ case SP_MessageBoxInformation:
+ return KIcon("dialog-information");
+ case SP_MessageBoxWarning:
+ return KIcon("dialog-warning");
+ case SP_MessageBoxCritical:
+ return KIcon("dialog-error");
+ case SP_MessageBoxQuestion:
+ return KIcon("dialog-information");
+ // case SP_DesktopIcon:
+ // return KIcon("user-desktop");
+ // case SP_TrashIcon:
+ // return KIcon("user-trash");
+ // case SP_ComputerIcon:
+ // return KIcon("computer");
+ // case SP_DriveFDIcon:
+ // return KIcon("media-floppy");
+ // case SP_DriveHDIcon:
+ // return KIcon("drive-harddisk");
+ // case SP_DriveCDIcon:
+ // case SP_DriveDVDIcon:
+ // return KIcon("media-optical");
+ // case SP_DriveNetIcon:
+ // return KIcon("network-server");
+ // case SP_DirOpenIcon:
+ // return KIcon("document-open");
+ // case SP_DirIcon:
+ // case SP_DirClosedIcon:
+ // return KIcon("folder");
+ // case SP_DirLinkIcon:
+ // case SP_FileIcon:
+ // return KIcon("application-x-zerosize");
+ // case SP_FileLinkIcon:
+ // case SP_ToolBarHorizontalExtensionButton:
+ // case SP_ToolBarVerticalExtensionButton:
+ case SP_FileDialogStart:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-edn" : "go-first");
+ case SP_FileDialogEnd:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-first" : "go-end");
+ case SP_FileDialogToParent:
+ return KIcon("go-up");
+ case SP_FileDialogNewFolder:
+ return KIcon("folder-new");
+ case SP_FileDialogDetailedView:
+ return KIcon("view-list-details");
+ // case SP_FileDialogInfoView:
+ // return KIcon("dialog-ok");
+ // case SP_FileDialogContentsView:
+ // return KIcon("dialog-ok");
+ case SP_FileDialogListView:
+ return KIcon("view-list-icons");
+ case SP_FileDialogBack:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous");
+ case SP_DialogOkButton:
+ return KIcon("dialog-ok");
+ case SP_DialogCancelButton:
+ return KIcon("dialog-cancel");
+ case SP_DialogHelpButton:
+ return KIcon("help-contents");
+ case SP_DialogOpenButton:
+ return KIcon("document-open");
+ case SP_DialogSaveButton:
+ return KIcon("document-save");
+ case SP_DialogCloseButton:
+ return KIcon("dialog-close");
+ case SP_DialogApplyButton:
+ return KIcon("dialog-ok-apply");
+ case SP_DialogResetButton:
+ return KIcon("document-revert");
+ // case SP_DialogDiscardButton:
+ // return KIcon("dialog-cancel");
+ case SP_DialogYesButton:
+ return KIcon("dialog-ok");
+ case SP_DialogNoButton:
+ return KIcon("dialog-cancel");
+ case SP_ArrowUp:
+ return KIcon("arrow-up");
+ case SP_ArrowDown:
+ return KIcon("arrow-down");
+ case SP_ArrowLeft:
+ return KIcon("arrow-left");
+ case SP_ArrowRight:
+ return KIcon("arrow-right");
+ case SP_ArrowBack:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous");
+ case SP_ArrowForward:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-previous"
+ : "go-next");
+ // case SP_DirHomeIcon:
+ // return KIcon("user-home");
+ // case SP_CommandLink:
+ // case SP_VistaShield:
+ case SP_BrowserReload:
+ return KIcon("view-refresh");
+ case SP_BrowserStop:
+ return KIcon("process-stop");
+ case SP_MediaPlay:
+ return KIcon("media-playback-start");
+ case SP_MediaStop:
+ return KIcon("media-playback-stop");
+ case SP_MediaPause:
+ return KIcon("media-playback-pause");
+ case SP_MediaSkipForward:
+ return KIcon("media-skip-forward");
+ case SP_MediaSkipBackward:
+ return KIcon("media-skip-backward");
+ case SP_MediaSeekForward:
+ return KIcon("media-seek-forward");
+ case SP_MediaSeekBackward:
+ return KIcon("media-seek-backward");
+ case SP_MediaVolume:
+ return KIcon("player-volume");
+ case SP_MediaVolumeMuted:
+ return KIcon("player-volume-muted");
+ default:
+ break;
+ }
}
#endif
return QTC_BASE_STYLE::standardIconImplementation(pix, option, widget);
@@ -4114,15 +4125,19 @@
tmpBtn.rect = r;
drawPrimitive(PE_PanelButtonCommand, &tmpBtn, painter, widget);
}
-// if (btn->features & QStyleOptionButton::HasMenu)
-// {
-// int mbi(pixelMetric(PM_MenuButtonIndicator, btn, widget));
-// QRect ir(btn->rect);
-// QStyleOptionButton newBtn(*btn);
-//
-// newBtn.rect = QRect(ir.right() - mbi + 2, ir.height()/2 - mbi/2 + 3, mbi - 6, mbi - 6);
-// drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
-// }
+ if (btn->features & QStyleOptionButton::HasMenu)
+ {
+ int mbi(pixelMetric(PM_MenuButtonIndicator, btn, widget));
+ QRect ir(btn->rect);
+ QStyleOptionButton newBtn(*btn);
+
+ newBtn.rect = QRect(Qt::LeftToRight==btn->direction
+ ? ir.right() - mbi
+ : ir.x() + 6,
+ ((ir.height() - mbi)/2),
+ mbi - 6, mbi);
+ drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
+ }
}
break;
case CE_PushButtonLabel:
@@ -4183,23 +4198,36 @@
if (button->features&QStyleOptionButton::HasMenu)
{
- int indicatorHeight(pixelMetric(PM_MenuButtonIndicator, button, widget)),
- indicatorWidth=indicatorHeight;
+ int mbi(pixelMetric(PM_MenuButtonIndicator, button, widget));
if (Qt::LeftToRight==button->direction)
- r = r.adjusted(0, 0, -indicatorWidth, 0);
+ r = r.adjusted(0, 0, -mbi, 0);
else
- r = r.adjusted(indicatorWidth, 0, 0, 0);
+ r = r.adjusted(mbi, 0, 0, 0);
- QRect ir(button->rect);
- QStyleOptionButton newBtn(*button);
+ if(APP_SKYPE==theThemedApp)
+ {
+ // Skype seems to draw a blurry arrow in the lower right corner,
+ // ...draw over this with a nicer sharper arrow...
+ QRect ar(button->rect.x()+(button->rect.width()-(LARGE_ARR_WIDTH+3)),
+ button->rect.y()+(button->rect.height()-(LARGE_ARR_HEIGHT+2)),
+ LARGE_ARR_WIDTH,
+ LARGE_ARR_HEIGHT);
- newBtn.rect = QRect(Qt::LeftToRight==button->direction
- ? ir.right() - indicatorWidth + 2
- : ir.x() + 6,
- ((ir.height() - indicatorHeight)/2) + 2,
- indicatorWidth - 6, indicatorHeight);
- drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
+ if(option->state &(State_On | State_Sunken))
+ ar.adjust(1, 1, 1, 1);
+ drawArrow(painter, ar, option, PE_IndicatorArrowDown);
+ }
+
+// QRect ir(button->rect);
+// QStyleOptionButton newBtn(*button);
+//
+// newBtn.rect = QRect(Qt::LeftToRight==button->direction
+// ? ir.right() - mbi + 2
+// : ir.x() + 6,
+// ((ir.height() - mbi)/2) + 2,
+// mbi - 6, mbi);
+// drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
}
int num(opts.embolden && button->features&QStyleOptionButton::DefaultButton ? 2 : 1);
@@ -7107,6 +7135,7 @@
else if(colouredMouseOver || WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w ||
(!IS_GLASS(app) && !sunken && option->state&State_Raised))
{
+ p->setRenderHint(QPainter::Antialiasing, true);
if(colouredMouseOver)
p->setPen(border[QTC_MO_STD_LIGHT(w, sunken)]);
else
@@ -7114,30 +7143,31 @@
if(colouredMouseOver || bevelledButton || APPEARANCE_RAISED==app)
{
//Left & top
- p->drawLine(br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-3);
- p->drawLine(br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
+ drawAaLine(p, br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-3);
+ drawAaLine(p, br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
if(colouredMouseOver)
p->setPen(border[QTC_MO_STD_DARK(w)]);
else
p->setPen(border[sunken ? 0 : dark]);
//Right & bottom
- p->drawLine(br.x()+br.width()-2, br.y()+1, br.x()+br.width()-2, br.y()+br.height()-3);
- p->drawLine(br.x()+1, br.y()+br.height()-2, br.x()+br.width()-2, br.y()+br.height()-2);
+ drawAaLine(p, br.x()+br.width()-2, br.y()+1, br.x()+br.width()-2, br.y()+br.height()-3);
+ drawAaLine(p, br.x()+1, br.y()+br.height()-2, br.x()+br.width()-2, br.y()+br.height()-2);
br.adjust(2, 2,-2,-2);
}
else
{
//Left & top
- p->drawLine(br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-(WIDGET_MDI_WINDOW_TITLE==w ? 1 : 2));
+ drawAaLine(p, br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-(WIDGET_MDI_WINDOW_TITLE==w ? 1 : 2));
if((WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w) && APPEARANCE_SHINY_GLASS==app)
br.adjust(2, 1, -1, -1);
else
{
- p->drawLine(br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
+ drawAaLine(p, br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
br.adjust(2, 2,-1,-1);
}
}
+ p->setRenderHint(QPainter::Antialiasing, false);
}
else
br.adjust(1, 1,-1,-1);
@@ -8598,5 +8628,12 @@
theNoEtchWidgets.remove(static_cast<const QWidget *>(o));
}
+void QtCurveStyle::setupKde4()
+{
+#ifdef QTC_USE_KDE4
+ checkKComponentData();
+#endif
+}
+
#include "qtcurve.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/style/qtcurve.h new/QtCurve-KDE4-0.59.6/style/qtcurve.h
--- old/QtCurve-KDE4-0.59.5/style/qtcurve.h 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/style/qtcurve.h 2008-07-30 21:18:43.000000000 +0200
@@ -139,6 +139,7 @@
private Q_SLOTS:
void widgetDestroyed(QObject *o);
+ void setupKde4();
QIcon standardIconImplementation(StandardPixmap pix, const QStyleOption *option=0, const QWidget *widget=0) const;
private:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package qtcurve-kde
checked in at Mon Aug 4 12:34:01 CEST 2008.
--------
--- KDE/qtcurve-kde/qtcurve-kde.changes 2008-07-21 10:26:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-kde/qtcurve-kde.changes 2008-08-04 01:20:10.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 01:19:52 CEST 2008 - dmueller(a)suse.de
+
+- update to 0.59.5:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE3-0.59.4.tar.bz2
New:
----
QtCurve-KDE3-0.59.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde.spec ++++++
--- /var/tmp/diff_new_pack.U14483/_old 2008-08-04 12:33:46.000000000 +0200
+++ /var/tmp/diff_new_pack.U14483/_new 2008-08-04 12:33:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde (Version 0.59.4)
+# spec file for package qtcurve-kde (Version 0.59.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,7 +17,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE
-Version: 0.59.4
+Version: 0.59.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE3-%{version}.tar.bz2
@@ -74,6 +74,10 @@
/opt/kde3/share/apps/kdisplay/color-schemes/QtCurve.kcsrc
%changelog
+* Mon Aug 04 2008 dmueller(a)suse.de
+- update to 0.59.5:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
* Mon Jul 21 2008 stbinner(a)suse.de
- update to 0.59.4:
* Left align dock widget titles - more KDE4 like.
++++++ QtCurve-KDE3-0.59.4.tar.bz2 -> QtCurve-KDE3-0.59.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.59.4/ChangeLog new/QtCurve-KDE3-0.59.5/ChangeLog
--- old/QtCurve-KDE3-0.59.4/ChangeLog 2008-07-18 00:10:46.000000000 +0200
+++ new/QtCurve-KDE3-0.59.5/ChangeLog 2008-07-30 21:18:18.000000000 +0200
@@ -1,3 +1,8 @@
+0.59.5
+------
+1. In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+
0.59.4
------
1. Left align dock widget titles - more KDE4 like. (Right align for RTL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.59.4/CMakeLists.txt new/QtCurve-KDE3-0.59.5/CMakeLists.txt
--- old/QtCurve-KDE3-0.59.4/CMakeLists.txt 2008-07-18 00:10:46.000000000 +0200
+++ new/QtCurve-KDE3-0.59.5/CMakeLists.txt 2008-07-30 21:18:18.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "59")
-set(CPACK_PACKAGE_VERSION_PATCH "4")
+set(CPACK_PACKAGE_VERSION_PATCH "5")
set(CPACK_PACKAGE_CONTACT "Craig Drummond <Craig.Drummond(a)lycos.co.uk>")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.59.4/config/qtcurveconfigbase.ui new/QtCurve-KDE3-0.59.5/config/qtcurveconfigbase.ui
--- old/QtCurve-KDE3-0.59.4/config/qtcurveconfigbase.ui 2008-07-18 00:10:46.000000000 +0200
+++ new/QtCurve-KDE3-0.59.5/config/qtcurveconfigbase.ui 2008-07-30 21:18:18.000000000 +0200
@@ -496,23 +496,6 @@
<string>Animated</string>
</property>
</widget>
- <spacer row="0" column="4">
- <property name="name">
- <cstring>spacer15</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>194</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
<spacer row="2" column="2">
<property name="name">
<cstring>spacer16</cstring>
@@ -546,14 +529,6 @@
<string>Bar:</string>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="3">
- <property name="name">
- <cstring>fillProgress</cstring>
- </property>
- <property name="text">
- <string>Fill</string>
- </property>
- </widget>
<widget class="QComboBox" row="1" column="1">
<property name="name">
<cstring>progressGrooveAppearance</cstring>
@@ -564,6 +539,51 @@
<cstring>progressGrooveColor</cstring>
</property>
</widget>
+ <spacer row="0" column="5">
+ <property name="name">
+ <cstring>spacer15</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>57</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ <spacer row="1" column="3" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>spacer29</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>300</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QCheckBox" row="0" column="4">
+ <property name="name">
+ <cstring>fillProgress</cstring>
+ </property>
+ <property name="text">
+ <string>No border</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Enable this option to remove the 1 pixel border around the filled element.</string>
+ </property>
+ </widget>
</grid>
</widget>
<widget class="QWidget">
@@ -1971,6 +1991,8 @@
</widget>
</grid>
</widget>
+<customwidgets>
+</customwidgets>
<tabstops>
<tabstop>stackList</tabstop>
<tabstop>appearance</tabstop>
@@ -1994,9 +2016,9 @@
<tabstop>progressAppearance</tabstop>
<tabstop>stripedProgress</tabstop>
<tabstop>animatedProgress</tabstop>
+ <tabstop>fillProgress</tabstop>
<tabstop>progressGrooveAppearance</tabstop>
<tabstop>progressGrooveColor</tabstop>
- <tabstop>fillProgress</tabstop>
<tabstop>embolden</tabstop>
<tabstop>defBtnIndicator</tabstop>
<tabstop>coloredMouseOver</tabstop>
@@ -2062,7 +2084,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kpushbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
@@ -2070,9 +2091,6 @@
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package opensuse-manual_en
checked in at Mon Aug 4 12:33:25 CEST 2008.
--------
--- opensuse-manual_en/opensuse-manual_en.changes 2008-07-29 11:19:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensuse-manual_en/opensuse-manual_en.changes 2008-07-31 11:50:02.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 31 11:49:18 CEST 2008 - ke(a)suse.de
+
+- Test release:
+ * Rename opensuse-appl to opensuse-apps.
+
+-------------------------------------------------------------------
Old:
----
opensuse-appl_en.pdf
New:
----
opensuse-apps_en.pdf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manual_en.spec ++++++
--- /var/tmp/diff_new_pack.j12239/_old 2008-08-04 12:32:57.000000000 +0200
+++ /var/tmp/diff_new_pack.j12239/_new 2008-08-04 12:32:57.000000000 +0200
@@ -16,12 +16,12 @@
%define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang}
%define my_book opensuse-html
Version: 11.1
-Release: 1
+Release: 4
Obsoletes: %{my_prov_obs}
Provides: %{my_prov_obs}
Provides: locale(desktop-data-openSUSE:en)
-Obsoletes: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-gnomeuser_en apparmor-admin_en
-Provides: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-gnomeuser_en apparmor-admin_en
+Obsoletes: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-kdequick_en opensuse-gnomequick_en opensuse-gnomeuser_en apparmor-admin_en
+Provides: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-kdequick_en opensuse-gnomequick_en opensuse-gnomeuser_en apparmor-admin_en
#OBS
Source09: LICENSE.txt
Source00: opensuse-html_en-html.tar.bz2
@@ -39,9 +39,9 @@
Source40: opensuse-gnomeuser_en.pdf
#Source41: opensuse-gnomeuser_en-graphics.tar.bz2
#Source42: opensuse-gnomeuser_en.tar.bz2
-Source50: opensuse-appl_en.pdf
-#Source51: opensuse-appl_en-graphics.tar.bz2
-#Source52: opensuse-appl_en.tar.bz2
+Source50: opensuse-apps_en.pdf
+#Source51: opensuse-apps_en-graphics.tar.bz2
+#Source52: opensuse-apps_en.tar.bz2
Source60: opensuse-reference_en.pdf
#Source61: opensuse-reference_en-graphics.tar.bz2
#Source62: opensuse-reference_en.tar.bz2
@@ -67,8 +67,8 @@
%description
The openSUSE manual package contains the Start-Up, Reference, AppArmor
-Administration Guide, GNOME and KDE Quick Start, and KDE User Guide.
-The GNOME User Guide is packaged separately as opensuse-gnomeuser_en.
+Quick Start, AppArmor Administration Guide, GNOME and KDE Quick Start,
+GNOME and KDE User Guide, and the Application Guide.
@@ -97,7 +97,7 @@
%package -n opensuse-kdeuser_en-pdf
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE KDE User Guide (English) as PDF
#Provides: locale(desktop-data-openSUSE:@LL@)
@@ -111,31 +111,30 @@
%package -n opensuse-gnomeuser_en-pdf
Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
-Summary: openSUSE GNOME User Guide (English)
+Summary: openSUSE GNOME User Guide (English) as PDF
#Provides: locale(desktop-data-openSUSE:@LL@)
###PDFOBS
%description -n opensuse-gnomeuser_en-pdf
-This package contains the openSUSE GNOME User Guide (English). The KDE
-User Guide is packaged together with the other openSUSE manuals as
-opensuse-manual_en.
+This package contains the PDF of the openSUSE GNOME User Guide
+(English).
-%package -n opensuse-appl_en-pdf
+%package -n opensuse-apps_en-pdf
Group: Documentation/SuSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE application Guide (English) as PDF
#Provides: locale(desktop-data-openSUSE:@LL@)
###PDFOBS
-%description -n opensuse-appl_en-pdf
+%description -n opensuse-apps_en-pdf
PDF of the openSUSE application Guide (English).
%package -n opensuse-reference_en-pdf
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE Reference (English) as PDF
#Provides: locale(desktop-data-openSUSE:@LL@)
@@ -147,7 +146,7 @@
%package -n opensuse-startup_en-pdf
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE Start-Up (English) as PDF
#Provides: locale(desktop-data-openSUSE:@LL@)
@@ -355,9 +354,9 @@
%doc opensuse-gnomeuser_en.pdf
%doc LICENSE.txt
-%files -n opensuse-appl_en-pdf
+%files -n opensuse-apps_en-pdf
%defattr(-, root, root)
-%doc opensuse-appl_en.pdf
+%doc opensuse-apps_en.pdf
%doc LICENSE.txt
%files -n opensuse-reference_en-pdf
@@ -390,8 +389,10 @@
%{gnome_dir}
%dir /usr/share/gnome
%dir /usr/share/gnome/help
-
%changelog
+* Thu Jul 31 2008 ke(a)suse.de
+- Test release:
+ * Rename opensuse-appl to opensuse-apps.
* Tue Jul 29 2008 ke(a)suse.de
- Test update for 11.1:
* Add more books to the HTML format.
++++++ opensuse-apparmor-admin_en.pdf ++++++
(binary differes)
++++++ opensuse-apparmor-quick_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomequick_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-html_en-desktop.tar.bz2 ++++++
++++ 1823 lines of diff (skipped)
++++++ opensuse-html_en-graphics.tar.bz2 ++++++
opensuse-manual_en/opensuse-html_en-graphics.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manual_en/opensuse-html_en-graphics.tar.bz2 differ: byte 335889, line 1230
++++++ opensuse-html_en-html.tar.bz2 ++++++
opensuse-manual_en/opensuse-html_en-html.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manual_en/opensuse-html_en-html.tar.bz2 differ: byte 11, line 1
++++++ opensuse-kdequick_en.pdf ++++++
(binary differes)
++++++ opensuse-kdeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-reference_en.pdf ++++++
(binary differes)
++++++ opensuse-startup_en.pdf ++++++
(binary differes)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package findutils
checked in at Mon Aug 4 12:31:25 CEST 2008.
--------
--- findutils/findutils.changes 2008-03-18 11:42:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/findutils/findutils.changes 2008-08-04 11:19:41.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 4 11:19:33 CEST 2008 - schwab(a)suse.de
+
+- Don't use fts.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ findutils.spec ++++++
--- /var/tmp/diff_new_pack.wp7615/_old 2008-08-04 12:30:48.000000000 +0200
+++ /var/tmp/diff_new_pack.wp7615/_new 2008-08-04 12:30:48.000000000 +0200
@@ -12,14 +12,14 @@
Name: findutils
Url: http://www.gnu.org/software/findutils/
-License: GPL v2 or later
+License: GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v3 or later
Group: Productivity/File utilities
Provides: find
Obsoletes: find
AutoReqProv: on
PreReq: %{install_info_prereq}
Version: 4.4.0
-Release: 1
+Release: 23
Summary: GNU find--Finding Files
Source: findutils-%{version}.tar.bz2
Source1: sysconfig.locate
@@ -45,6 +45,7 @@
Tim Wood <tim(a)toad.com>
%package locate
+License: GPL v3 or later
Summary: Tool for Locating Files (GNU Findutils Subpackage)
Group: Productivity/File utilities
Provides: findutils:/usr/bin/locate
@@ -82,6 +83,7 @@
--localstatedir=/var/lib \
--infodir=%{_infodir} --mandir=%{_mandir} \
--without-included-regex \
+ --without-fts \
--enable-d_type-optimisation
make
@@ -93,6 +95,7 @@
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-updatedb
%find_lang %name
rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind
+rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind
rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
%clean
@@ -128,6 +131,8 @@
/var/adm/fillup-templates/*
%changelog
+* Mon Aug 04 2008 schwab(a)suse.de
+- Don't use fts.
* Tue Mar 18 2008 schwab(a)suse.de
- Update to findutils 4.4.0.
See NEWS for details.
@@ -141,7 +146,7 @@
The following translations have been updated:
Hungarian, Dutch, Slovenian, Swedish, Traditional Chinese,
Polish, Irish, Portuguese, Slovak.
-* Fri Jan 25 2008 schwab(a)suse.de
+* Sat Jan 26 2008 schwab(a)suse.de
- Update to findutils 4.2.32.
** License changes
This version of findutils is now distributed under version 3 (or
@@ -336,7 +341,7 @@
- Cleanup selinux patch.
* Wed Oct 15 2003 ro(a)suse.de
- link libselinux static
-* Tue Oct 14 2003 kukuk(a)suse.de
+* Wed Oct 15 2003 kukuk(a)suse.de
- Add selinux patch
- Build not as root
- Fix permissions in RPM filelist
++++++ findutils-4.4.0.diff ++++++
--- /var/tmp/diff_new_pack.wp7615/_old 2008-08-04 12:30:48.000000000 +0200
+++ /var/tmp/diff_new_pack.wp7615/_new 2008-08-04 12:30:48.000000000 +0200
@@ -9,6 +9,40 @@
used as regular expressions (with @code{find ... -regex}, so you need
to specify these paths in the same way that @code{find} will encounter
them. This means for example that the paths must not include trailing
+--- find/ftsfind.c
++++ find/ftsfind.c
+@@ -388,7 +388,7 @@ consider_visiting(FTS *p, FTSENT *ent)
+ {
+ struct stat statbuf;
+ mode_t mode;
+- int ignore, isdir;
++ int ignore;
+
+ if (options.debug_options & DebugSearch)
+ fprintf(stderr,
+@@ -498,22 +498,6 @@ consider_visiting(FTS *p, FTSENT *ent)
+
+ /* examine this item. */
+ ignore = 0;
+- isdir = S_ISDIR(statbuf.st_mode)
+- || (FTS_D == ent->fts_info)
+- || (FTS_DP == ent->fts_info)
+- || (FTS_DC == ent->fts_info);
+-
+- if (isdir && (ent->fts_info == FTS_NSOK))
+- {
+- /* This is a directory, but fts did not stat it, so
+- * presumably would not be planning to search its
+- * children. Force a stat of the file so that the
+- * children can be checked.
+- */
+- fts_set(p, ent, FTS_AGAIN);
+- return;
+- }
+-
+ if (options.maxdepth >= 0)
+ {
+ if (ent->fts_level >= options.maxdepth)
--- locate/updatedb.1
+++ locate/updatedb.1
@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package cpio
checked in at Mon Aug 4 12:30:39 CEST 2008.
--------
--- cpio/cpio.changes 2008-08-01 18:18:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/cpio/cpio.changes 2008-08-04 12:02:27.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 12:02:01 CEST 2008 - lmichnovic(a)suse.cz
+
+- changed default tape device for 'mt' command to /dev/nst0
+ /dev/tape is not symlink any more but directory handled by udev
+ (*default_tape_dev.patch) [bnc#355241]
+
+-------------------------------------------------------------------
New:
----
cpio-2.9-default_tape_dev.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpio.spec ++++++
--- /var/tmp/diff_new_pack.In6272/_old 2008-08-04 12:30:27.000000000 +0200
+++ /var/tmp/diff_new_pack.In6272/_new 2008-08-04 12:30:27.000000000 +0200
@@ -17,7 +17,7 @@
Group: Productivity/Archiving/Compression
AutoReqProv: on
Version: 2.9
-Release: 73
+Release: 75
Summary: A Backup and Archiving Utility
Source: cpio-2.9.tar.bz2
Patch1: cpio-2.9-no_rmt.patch
@@ -40,6 +40,7 @@
# make posibble to have device nodes with major number > 127
# Red Hat Bugzilla #450109
Patch17: cpio-2.9-dev_number.patch
+Patch18: cpio-2.9-default_tape_dev.patch
PreReq: %install_info_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
@@ -83,6 +84,7 @@
%patch15
%patch16
%patch17
+%patch18
chmod 755 .
chmod u+w *
chmod a+r *
@@ -127,6 +129,10 @@
%files lang -f %{name}.lang
%changelog
+* Mon Aug 04 2008 lmichnovic(a)suse.cz
+- changed default tape device for 'mt' command to /dev/nst0
+ /dev/tape is not symlink any more but directory handled by udev
+ (*default_tape_dev.patch) [bnc#355241]
* Fri Aug 01 2008 cthiel(a)suse.de
- specfile cleanup
* Fri Jul 18 2008 lmichnovic(a)suse.cz
++++++ cpio-2.9-default_tape_dev.patch ++++++
--- src/mt.c
+++ src/mt.c
@@ -664,11 +664,20 @@
{
tapedev = getenv ("TAPE");
if (tapedev == NULL)
-#ifdef DEFTAPE /* From sys/mtio.h. */
- tapedev = DEFTAPE;
-#else
+/* Suse doesn't have /dev/tape as link to /dev/nst0 any more.
+Instead it uses udev and creates different names in /dev/tape/by-id/ directory.
+If it is SCSI tape storage then it creates /dev/tape/by-id/scsi--nst
+If it is USB device then it creates something not predictibable:
+/dev/tape/by-id/scsi-*HP_blabla*{VENDOR_SPECIFIC}*-nst
+So let's use old behave which was /dev/nst0.
+bnc#355241
+*/
+/* #ifdef DEFTAPE * From sys/mtio.h. * */
+# define DEFSUSETAPE "/dev/nst0"
+ tapedev = DEFSUSETAPE;
+/* #else
error (1, 0, _("no tape device specified"));
-#endif
+#endif */
}
#ifdef MTDENS
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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