September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Mon Sep 27 00:35:22 CEST 2010. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-09-24 06:40:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-09-26 06:40:08.000000000 +0200 @@ -2 +2 @@ -Fri Sep 24 06:40:09 CEST 2010 - autobuild(a)suse.de +Sun Sep 26 06:40:08 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-24 +- automated update on 2010-09-26 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.5KbmK0/_old 2010-09-27 00:32:11.000000000 +0200 +++ /var/tmp/diff_new_pack.5KbmK0/_new 2010-09-27 00:32:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package arpwatch-ethercodes (Version 2010.9.24) +# spec file for package arpwatch-ethercodes (Version 2010.9.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2010.9.24 +Version: 2010.9.25 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ Files AUTO/all/arpwatch-ethercodes/oui.txt.bz2 and /mounts/work_src_done/STABLE/arpwatch-ethercodes/oui.txt.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tracker for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package tracker for openSUSE:Factory checked in at Sun Sep 26 21:55:41 CEST 2010. -------- --- GNOME/tracker/tracker.changes 2010-09-18 14:37:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/tracker/tracker.changes 2010-09-24 10:05:47.000000000 +0200 @@ -1,0 +2,31 @@ +Fri Sep 24 09:53:57 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.9.22: + + LRU for database statement cache (huge memory footprint + difference) + + Monitor event black listing and events are condensed (less + event spam up the stack) + + SPARQL: Rework variable name support to fix regression + + Ontology: NCO: Set tracker:notify to true for nco:ContactList + + data-generators: Added a default value for undefined categories + + functional-tests updates. + + libtracker-data: + - Fixed regression SELECT ... AS ?var not being honored in + ORDER BY + - Don't cache stmt if the query contains a regular expression + - Fixed memory leak in journal rotation + + libtracker-sparql: + - Make it possible to set the max LRU cache size per connection + - Added an "environment variables" section to documentation + + tracker-store: + - Added TRACKER_STORE_{SELECT|UPDATE}_CACHE_SIZE environment + variables to control new LRU feature + - Fixed crash when accessing variable_names array + + tracker-extract: + - remove unneeded call to tracker_topanalyzer_shutdown() + - Fixed QUILLimagefilter support + + tracker-miner-fs: Fixed use of uninitialized variable + + Bugs fixed: nokia#192537, nokia#193796, bgo#630176 + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tracker-0.9.21.tar.bz2 New: ---- tracker-0.9.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tracker.spec ++++++ --- /var/tmp/diff_new_pack.59fxmf/_old 2010-09-26 21:54:57.000000000 +0200 +++ /var/tmp/diff_new_pack.59fxmf/_new 2010-09-26 21:54:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tracker (Version 0.9.21) +# spec file for package tracker (Version 0.9.22) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Luis Medinas, Portugal @@ -19,7 +19,7 @@ Name: tracker -Version: 0.9.21 +Version: 0.9.22 Release: 1 # FIXME: 2010-03-24 building gtk-doc fails because of a bug in graphviz License: GPLv2+ ++++++ tracker-0.9.21.tar.bz2 -> tracker-0.9.22.tar.bz2 ++++++ GNOME/tracker/tracker-0.9.21.tar.bz2 /mounts/work_src_done/STABLE/tracker/tracker-0.9.22.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory checked in at Sun Sep 26 21:51:03 CEST 2010. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-09-18 14:57:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-09-24 09:56:48.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Sep 24 09:54:04 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 1.6.2: + + Theme evolution's headers as headers, and not buttons. + + Set fallback icon theme to gnome instead of hicolor. This helps + with some missing icons in evolution. + + If drawing a background image, ensure that this can also be + drawn onto kwin border - if it has a bottom edge. + + Attempt to fix light text on dark background for OpenOffice.org + + Use same radius for all corners of progressbar. + + Apply menu background settings to menus of non-editable combos. + (Rounding is not applied due to clipping/shadow issues with + Gtk2) + + Allow borderless rounded popup menus. + + Don't draw double focus on Gimp combos. + + Allow rounded menus when rounding is set to slight. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-Gtk2-1.6.1.tar.bz2 New: ---- QtCurve-Gtk2-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.VULpqA/_old 2010-09-26 21:47:53.000000000 +0200 +++ /var/tmp/diff_new_pack.VULpqA/_new 2010-09-26 21:47:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 1.6.1) +# spec file for package qtcurve-gtk2 (Version 1.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: qtcurve-gtk2 -Version: 1.6.1 +Version: 1.6.2 Release: 1 License: GPLv2+ Summary: QtCurve style for Gtk2 ++++++ QtCurve-Gtk2-1.6.1.tar.bz2 -> QtCurve-Gtk2-1.6.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/CMakeLists.txt new/QtCurve-Gtk2-1.6.2/CMakeLists.txt --- old/QtCurve-Gtk2-1.6.1/CMakeLists.txt 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/CMakeLists.txt 2010-09-22 21:38:54.000000000 +0200 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "6") -set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_PACKAGE_VERSION_PATCH "2") set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond(a)googlemail.com>") 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-Gtk2-1.6.1/ChangeLog new/QtCurve-Gtk2-1.6.2/ChangeLog --- old/QtCurve-Gtk2-1.6.1/ChangeLog 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/ChangeLog 2010-09-22 21:38:54.000000000 +0200 @@ -1,3 +1,18 @@ +1.6.2 +----- +1. Theme evolution's headers as headers, and not buttons. +2. Set fallback icon theme to gnome instead of hicolor. This helps with some + missing icons in evolution. +3. If drawing a background image, ensure that this can also be drawn onto kwin + border - if it has a bottom edge. +4. Attempt to fix light text on dark background for OpenOffice.org +5. Use same radius for all corners of progressbar. +6. Apply menu background settings to menus of non-editable combos. (Rounding is + not applied due to clipping/shadow issues with Gtk2) +7. Allow borderless rounded popup menus. +8. Don't draw double focus on Gimp combos. +9. Allow rounded menus when rounding is set to slight. + 1.6.1 ----- 1. Add option to have rounded popup menus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/common/common.h new/QtCurve-Gtk2-1.6.2/common/common.h --- old/QtCurve-Gtk2-1.6.1/common/common.h 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/common/common.h 2010-09-22 21:38:54.000000000 +0200 @@ -404,6 +404,12 @@ #define RINGS_SQUARE_LARGE_SIZE 120.0 #define RINGS_SQUARE_SMALL_SIZE 100.0 +#if !defined __cplusplus +#define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 3.5) +#else +#define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 2.5) +#endif + #define CUSTOM_BGND (!(IS_FLAT_BGND(opts.bgndAppearance)) || IMG_NONE!=opts.bgndImage.type || 100!=opts.bgndOpacity || 100!=opts.dlgOpacity) #define GLOW_PROG_ALPHA 0.55 @@ -427,7 +433,8 @@ QtC_ToggleButtons, QtC_MenubarColor, QtC_WindowBorder, - QtC_CustomBgnd + QtC_CustomBgnd, + QtC_TitleBarApp } QtCMetrics; #define QtC_StateKWin ((QStyle::StateFlag)0x10000000) @@ -449,7 +456,8 @@ #endif #if defined CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000)) -#define QTCURVE_PREVIEW_CONFIG "QTCURVE_PREVIEW_CONFIG" +#define QTCURVE_PREVIEW_CONFIG "QTCURVE_PREVIEW_CONFIG" +#define QTCURVE_PREVIEW_CONFIG_FULL "QTCURVE_PREVIEW_CONFIG_FULL" typedef enum { @@ -501,7 +509,8 @@ NUM_TITLEBAR_BUTTONS } ETitleBarButtons; -#define TBAR_VERSION_HACK 65535 +#define TBAR_VERSION_HACK 65535 +#define TBAR_BORDER_VERSION_HACK (TBAR_VERSION_HACK+1000) typedef std::map<int, QColor> TBCols; #endif @@ -1877,6 +1886,13 @@ return (w>h ? h : w)/2.0; #endif + if(RADIUS_EXTERNAL==rad && !opts->fillProgress && (WIDGET_PROGRESSBAR==widget +#ifndef __cplusplus + || WIDGET_ENTRY_PROGRESSBAR==widget +#endif + )) + rad=RADIUS_INTERNAL; + switch(rad) { case RADIUS_SELECTION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/common/config_file.c new/QtCurve-Gtk2-1.6.2/common/config_file.c --- old/QtCurve-Gtk2-1.6.1/common/config_file.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/common/config_file.c 2010-09-22 21:38:54.000000000 +0200 @@ -1365,6 +1365,225 @@ } #endif +static void checkConfig(Options *opts) +{ + /* **Must** check appearance first, as the rest will default to this */ + checkAppearance(&opts->appearance, opts); + checkAppearance(&opts->bgndAppearance, opts); + checkAppearance(&opts->menuBgndAppearance, opts); + checkAppearance(&opts->menubarAppearance, opts); + checkAppearance(&opts->menuitemAppearance, opts); + checkAppearance(&opts->toolbarAppearance, opts); + checkAppearance(&opts->lvAppearance, opts); + checkAppearance(&opts->tabAppearance, opts); + checkAppearance(&opts->activeTabAppearance, opts); + checkAppearance(&opts->sliderAppearance, opts); + checkAppearance(&opts->selectionAppearance, opts); + checkAppearance(&opts->titlebarAppearance, opts); + checkAppearance(&opts->inactiveTitlebarAppearance, opts); +#ifdef __cplusplus + checkAppearance(&opts->titlebarButtonAppearance, opts); + checkAppearance(&opts->selectionAppearance, opts); + checkAppearance(&opts->dwtAppearance, opts); +#endif + checkAppearance(&opts->menuStripeAppearance, opts); + checkAppearance(&opts->progressAppearance, opts); + checkAppearance(&opts->progressGrooveAppearance, opts); + checkAppearance(&opts->grooveAppearance, opts); + checkAppearance(&opts->sunkenAppearance, opts); + checkAppearance(&opts->sbarBgndAppearance, opts); + checkAppearance(&opts->sliderFill, opts); + checkAppearance(&opts->tooltipAppearance, opts); + + if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) + opts->shadeCheckRadio=SHADE_SELECTED; + + checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); + checkColor(&opts->shadeSliders, &opts->customSlidersColor); + checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor); + checkColor(&opts->menuStripe, &opts->customMenuStripeColor); + checkColor(&opts->comboBtn, &opts->customComboBtnColor); + checkColor(&opts->sortedLv, &opts->customSortedLvColor); + if(APPEARANCE_BEVELLED==opts->toolbarAppearance) + opts->toolbarAppearance=APPEARANCE_GRADIENT; + else if(APPEARANCE_RAISED==opts->toolbarAppearance) + opts->toolbarAppearance=APPEARANCE_FLAT; + + if(APPEARANCE_BEVELLED==opts->menubarAppearance) + opts->menubarAppearance=APPEARANCE_GRADIENT; + else if(APPEARANCE_RAISED==opts->menubarAppearance) + opts->menubarAppearance=APPEARANCE_FLAT; + + if(APPEARANCE_BEVELLED==opts->sliderAppearance) + opts->sliderAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_BEVELLED==opts->tabAppearance) + opts->tabAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_BEVELLED==opts->activeTabAppearance) + opts->activeTabAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_RAISED==opts->selectionAppearance) + opts->selectionAppearance=APPEARANCE_FLAT; + else if(APPEARANCE_BEVELLED==opts->selectionAppearance) + opts->selectionAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_RAISED==opts->menuStripeAppearance) + opts->menuStripeAppearance=APPEARANCE_FLAT; + else if(APPEARANCE_BEVELLED==opts->menuStripeAppearance) + opts->menuStripeAppearance=APPEARANCE_GRADIENT; + + if(opts->highlightFactor<MIN_HIGHLIGHT_FACTOR || opts->highlightFactor>MAX_HIGHLIGHT_FACTOR) + opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; + + if(opts->crHighlight<MIN_HIGHLIGHT_FACTOR || opts->crHighlight>MAX_HIGHLIGHT_FACTOR) + opts->crHighlight=DEFAULT_CR_HIGHLIGHT_FACTOR; + + if(opts->splitterHighlight<MIN_HIGHLIGHT_FACTOR || opts->splitterHighlight>MAX_HIGHLIGHT_FACTOR) + opts->splitterHighlight=DEFAULT_SPLITTER_HIGHLIGHT_FACTOR; + +#if !defined __cplusplus || defined CONFIG_DIALOG + if(opts->expanderHighlight<MIN_HIGHLIGHT_FACTOR || opts->expanderHighlight>MAX_HIGHLIGHT_FACTOR) + opts->expanderHighlight=DEFAULT_EXPANDER_HIGHLIGHT_FACTOR; +#endif + + if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY) + opts->menuDelay=DEFAULT_MENU_DELAY; + + if(0==opts->sliderWidth%2) + opts->sliderWidth++; + + if(opts->sliderWidth<MIN_SLIDER_WIDTH || opts->sliderWidth>MAX_SLIDER_WIDTH) + opts->sliderWidth=DEFAULT_SLIDER_WIDTH; + + if(opts->sliderWidth<DEFAULT_SLIDER_WIDTH) + opts->sliderThumbs=LINE_NONE; + + if(opts->lighterPopupMenuBgnd<MIN_LIGHTER_POPUP_MENU || opts->lighterPopupMenuBgnd>MAX_LIGHTER_POPUP_MENU) + opts->lighterPopupMenuBgnd=DEF_POPUPMENU_LIGHT_FACTOR; + + if(opts->tabBgnd<MIN_TAB_BGND || opts->tabBgnd>MAX_TAB_BGND) + opts->tabBgnd=DEF_TAB_BGND; + + if(opts->animatedProgress && !opts->stripedProgress) + opts->animatedProgress=false; + + if(0==opts->gbFactor) + opts->groupBox=FRAME_PLAIN; + + if(opts->gbFactor<MIN_GB_FACTOR || opts->gbFactor>MAX_GB_FACTOR) + opts->gbFactor=DEF_GB_FACTOR; + +#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG + opts->crSize=CR_SMALL_SIZE; + if(SLIDER_CIRCULAR==opts->sliderStyle) + opts->sliderStyle=SLIDER_ROUND; + if(STRIPE_FADE==opts->stripedProgress) + opts->stripedProgress=STRIPE_PLAIN; +#endif + /* For now, only 2 sizes... */ + if(opts->crSize!=CR_SMALL_SIZE && opts->crSize!=CR_LARGE_SIZE) + opts->crSize=CR_SMALL_SIZE; + +/* +?? + if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems) + opts->colorMenubarMouseOver=true; +*/ + +#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG + if(opts->round>ROUND_FULL) + opts->round=ROUND_FULL; +#endif +#ifndef CONFIG_DIALOG + if(MO_GLOW==opts->coloredMouseOver && EFFECT_NONE==opts->buttonEffect) + opts->coloredMouseOver=MO_COLORED_THICK; + + if(IND_GLOW==opts->defBtnIndicator && EFFECT_NONE==opts->buttonEffect) + opts->defBtnIndicator=IND_TINT; + + if(opts->round>ROUND_EXTRA && FOCUS_GLOW!=opts->focus) + opts->focus=FOCUS_LINE; + + if(EFFECT_NONE==opts->buttonEffect) + { + opts->etchEntry=false; + if(FOCUS_GLOW==opts->focus) + opts->focus=FOCUS_FULL; + } + +// if(opts->squareScrollViews) +// opts->highlightScrollViews=false; + + if(SHADE_WINDOW_BORDER==opts->shadeMenubars) + opts->shadeMenubarOnlyWhenActive=true; + + if(MO_GLOW==opts->coloredMouseOver) + opts->coloredTbarMo=true; + + if(opts->round<ROUND_SLIGHT) + opts->square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS; +#endif + + if(opts->bgndOpacity<0 || opts->bgndOpacity>100) + opts->bgndOpacity=100; + if(opts->dlgOpacity<0 || opts->dlgOpacity>100) + opts->dlgOpacity=100; + if(opts->menuBgndOpacity<0 || opts->menuBgndOpacity>100) + opts->menuBgndOpacity=100; + +#ifndef CONFIG_DIALOG + opts->bgndAppearance=MODIFY_AGUA(opts->bgndAppearance); + opts->selectionAppearance=MODIFY_AGUA(opts->selectionAppearance); + opts->lvAppearance=MODIFY_AGUA_X(opts->lvAppearance, APPEARANCE_LV_AGUA); + opts->sbarBgndAppearance=MODIFY_AGUA(opts->sbarBgndAppearance); + opts->tooltipAppearance=MODIFY_AGUA(opts->tooltipAppearance); + opts->progressGrooveAppearance=MODIFY_AGUA(opts->progressGrooveAppearance); + opts->menuBgndAppearance=MODIFY_AGUA(opts->menuBgndAppearance); + opts->menuStripeAppearance=MODIFY_AGUA(opts->menuStripeAppearance); + opts->grooveAppearance=MODIFY_AGUA(opts->grooveAppearance); + opts->progressAppearance=MODIFY_AGUA(opts->progressAppearance); + opts->sliderFill=MODIFY_AGUA(opts->sliderFill); + opts->tabAppearance=MODIFY_AGUA(opts->tabAppearance); + opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance); + opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance); + + if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS))) + opts->borderProgress=true; + + opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance); + opts->inactiveTitlebarAppearance=MODIFY_AGUA(opts->inactiveTitlebarAppearance); + + if(opts->shadePopupMenu && SHADE_NONE==opts->shadeMenubars) + opts->shadePopupMenu=false; + + if(opts->shadePopupMenu) + opts->lighterPopupMenuBgnd=0; +#ifdef __cplusplus + +#if defined QT_VERSION && QT_VERSION >= 0x040000 + if(!(opts->titlebarButtons&TITLEBAR_BUTTON_ROUND)) +#endif + opts->titlebarButtonAppearance=MODIFY_AGUA(opts->titlebarButtonAppearance); + opts->dwtAppearance=MODIFY_AGUA(opts->dwtAppearance); +#endif + if(opts->windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR && + (opts->windowBorder&WINDOW_BORDER_BLEND_TITLEBAR || SHADE_WINDOW_BORDER==opts->shadeMenubars)) + opts->windowBorder-=WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR; + + if(APPEARANCE_FLAT==opts->tabAppearance) + opts->tabAppearance=APPEARANCE_RAISED; + if(EFFECT_NONE==opts->buttonEffect) + opts->etchEntry=false; + if(opts->colorSliderMouseOver && + (SHADE_NONE==opts->shadeSliders || SHADE_DARKEN==opts->shadeSliders)) + opts->colorSliderMouseOver=false; +#endif /* ndef CONFIG_DIALOG */ + + if(LINE_1DOT==opts->toolbarSeparators) + opts->toolbarSeparators=LINE_DOTS; +} + #ifdef __cplusplus static bool readConfig(const QString &file, Options *opts, Options *defOpts=0L) #else @@ -2030,165 +2249,8 @@ } #endif - /* **Must** check appearance first, as the rest will default to this */ - checkAppearance(&opts->appearance, opts); - checkAppearance(&opts->bgndAppearance, opts); - checkAppearance(&opts->menuBgndAppearance, opts); - checkAppearance(&opts->menubarAppearance, opts); - checkAppearance(&opts->menuitemAppearance, opts); - checkAppearance(&opts->toolbarAppearance, opts); - checkAppearance(&opts->lvAppearance, opts); - checkAppearance(&opts->tabAppearance, opts); - checkAppearance(&opts->activeTabAppearance, opts); - checkAppearance(&opts->sliderAppearance, opts); - checkAppearance(&opts->selectionAppearance, opts); - checkAppearance(&opts->titlebarAppearance, opts); - checkAppearance(&opts->inactiveTitlebarAppearance, opts); -#ifdef __cplusplus - checkAppearance(&opts->titlebarButtonAppearance, opts); - checkAppearance(&opts->selectionAppearance, opts); - checkAppearance(&opts->dwtAppearance, opts); -#endif - checkAppearance(&opts->menuStripeAppearance, opts); - checkAppearance(&opts->progressAppearance, opts); - checkAppearance(&opts->progressGrooveAppearance, opts); - checkAppearance(&opts->grooveAppearance, opts); - checkAppearance(&opts->sunkenAppearance, opts); - checkAppearance(&opts->sbarBgndAppearance, opts); - checkAppearance(&opts->sliderFill, opts); - checkAppearance(&opts->tooltipAppearance, opts); -#ifndef __cplusplus - releaseConfig(cfg); -#endif - if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) - opts->shadeCheckRadio=SHADE_SELECTED; - - checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); - checkColor(&opts->shadeSliders, &opts->customSlidersColor); - checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor); - checkColor(&opts->menuStripe, &opts->customMenuStripeColor); - checkColor(&opts->comboBtn, &opts->customComboBtnColor); - checkColor(&opts->sortedLv, &opts->customSortedLvColor); - if(APPEARANCE_BEVELLED==opts->toolbarAppearance) - opts->toolbarAppearance=APPEARANCE_GRADIENT; - else if(APPEARANCE_RAISED==opts->toolbarAppearance) - opts->toolbarAppearance=APPEARANCE_FLAT; - - if(APPEARANCE_BEVELLED==opts->menubarAppearance) - opts->menubarAppearance=APPEARANCE_GRADIENT; - else if(APPEARANCE_RAISED==opts->menubarAppearance) - opts->menubarAppearance=APPEARANCE_FLAT; - - if(APPEARANCE_BEVELLED==opts->sliderAppearance) - opts->sliderAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_BEVELLED==opts->tabAppearance) - opts->tabAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_BEVELLED==opts->activeTabAppearance) - opts->activeTabAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_RAISED==opts->selectionAppearance) - opts->selectionAppearance=APPEARANCE_FLAT; - else if(APPEARANCE_BEVELLED==opts->selectionAppearance) - opts->selectionAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_RAISED==opts->menuStripeAppearance) - opts->menuStripeAppearance=APPEARANCE_FLAT; - else if(APPEARANCE_BEVELLED==opts->menuStripeAppearance) - opts->menuStripeAppearance=APPEARANCE_GRADIENT; - - if(opts->highlightFactor<MIN_HIGHLIGHT_FACTOR || opts->highlightFactor>MAX_HIGHLIGHT_FACTOR) - opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; - - if(opts->crHighlight<MIN_HIGHLIGHT_FACTOR || opts->crHighlight>MAX_HIGHLIGHT_FACTOR) - opts->crHighlight=DEFAULT_CR_HIGHLIGHT_FACTOR; - - if(opts->splitterHighlight<MIN_HIGHLIGHT_FACTOR || opts->splitterHighlight>MAX_HIGHLIGHT_FACTOR) - opts->splitterHighlight=DEFAULT_SPLITTER_HIGHLIGHT_FACTOR; - -#if !defined __cplusplus || defined CONFIG_DIALOG - if(opts->expanderHighlight<MIN_HIGHLIGHT_FACTOR || opts->expanderHighlight>MAX_HIGHLIGHT_FACTOR) - opts->expanderHighlight=DEFAULT_EXPANDER_HIGHLIGHT_FACTOR; -#endif - - if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY) - opts->menuDelay=DEFAULT_MENU_DELAY; - - if(0==opts->sliderWidth%2) - opts->sliderWidth++; - - if(opts->sliderWidth<MIN_SLIDER_WIDTH || opts->sliderWidth>MAX_SLIDER_WIDTH) - opts->sliderWidth=DEFAULT_SLIDER_WIDTH; - - if(opts->sliderWidth<DEFAULT_SLIDER_WIDTH) - opts->sliderThumbs=LINE_NONE; - - if(opts->lighterPopupMenuBgnd<MIN_LIGHTER_POPUP_MENU || opts->lighterPopupMenuBgnd>MAX_LIGHTER_POPUP_MENU) - opts->lighterPopupMenuBgnd=DEF_POPUPMENU_LIGHT_FACTOR; - - if(opts->tabBgnd<MIN_TAB_BGND || opts->tabBgnd>MAX_TAB_BGND) - opts->tabBgnd=DEF_TAB_BGND; - - if(opts->animatedProgress && !opts->stripedProgress) - opts->animatedProgress=false; - - if(0==opts->gbFactor) - opts->groupBox=FRAME_PLAIN; - - if(opts->gbFactor<MIN_GB_FACTOR || opts->gbFactor>MAX_GB_FACTOR) - opts->gbFactor=DEF_GB_FACTOR; - -#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG - opts->crSize=CR_SMALL_SIZE; - if(SLIDER_CIRCULAR==opts->sliderStyle) - opts->sliderStyle=SLIDER_ROUND; - if(STRIPE_FADE==opts->stripedProgress) - opts->stripedProgress=STRIPE_PLAIN; -#endif - /* For now, only 2 sizes... */ - if(opts->crSize!=CR_SMALL_SIZE && opts->crSize!=CR_LARGE_SIZE) - opts->crSize=CR_SMALL_SIZE; - -/* -?? - if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems) - opts->colorMenubarMouseOver=true; -*/ - -#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG - if(opts->round>ROUND_FULL) - opts->round=ROUND_FULL; -#endif -#ifndef CONFIG_DIALOG - if(MO_GLOW==opts->coloredMouseOver && EFFECT_NONE==opts->buttonEffect) - opts->coloredMouseOver=MO_COLORED_THICK; - - if(IND_GLOW==opts->defBtnIndicator && EFFECT_NONE==opts->buttonEffect) - opts->defBtnIndicator=IND_TINT; + checkConfig(opts); - if(opts->round>ROUND_EXTRA && FOCUS_GLOW!=opts->focus) - opts->focus=FOCUS_LINE; - - if(EFFECT_NONE==opts->buttonEffect) - { - opts->etchEntry=false; - if(FOCUS_GLOW==opts->focus) - opts->focus=FOCUS_FULL; - } - -// if(opts->squareScrollViews) -// opts->highlightScrollViews=false; - - if(SHADE_WINDOW_BORDER==opts->shadeMenubars) - opts->shadeMenubarOnlyWhenActive=true; - - if(MO_GLOW==opts->coloredMouseOver) - opts->coloredTbarMo=true; - - if(opts->round<ROUND_FULL) - opts->square|=SQUARE_POPUP_MENUS; -#endif #ifndef __cplusplus if(!defOpts) { @@ -2198,70 +2260,7 @@ if(def->customGradient[i]) free(def->customGradient[i]); } -#endif - - if(opts->bgndOpacity<0 || opts->bgndOpacity>100) - opts->bgndOpacity=100; - if(opts->dlgOpacity<0 || opts->dlgOpacity>100) - opts->dlgOpacity=100; - if(opts->menuBgndOpacity<0 || opts->menuBgndOpacity>100) - opts->menuBgndOpacity=100; - - if(!(opts->square&SQUARE_POPUP_MENUS)) - opts->popupBorder=true; - -#ifndef CONFIG_DIALOG - opts->bgndAppearance=MODIFY_AGUA(opts->bgndAppearance); - opts->selectionAppearance=MODIFY_AGUA(opts->selectionAppearance); - opts->lvAppearance=MODIFY_AGUA_X(opts->lvAppearance, APPEARANCE_LV_AGUA); - opts->sbarBgndAppearance=MODIFY_AGUA(opts->sbarBgndAppearance); - opts->tooltipAppearance=MODIFY_AGUA(opts->tooltipAppearance); - opts->progressGrooveAppearance=MODIFY_AGUA(opts->progressGrooveAppearance); - opts->menuBgndAppearance=MODIFY_AGUA(opts->menuBgndAppearance); - opts->menuStripeAppearance=MODIFY_AGUA(opts->menuStripeAppearance); - opts->grooveAppearance=MODIFY_AGUA(opts->grooveAppearance); - opts->progressAppearance=MODIFY_AGUA(opts->progressAppearance); - opts->sliderFill=MODIFY_AGUA(opts->sliderFill); - opts->tabAppearance=MODIFY_AGUA(opts->tabAppearance); - opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance); - opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance); - - if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS))) - opts->borderProgress=true; - - opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance); - opts->inactiveTitlebarAppearance=MODIFY_AGUA(opts->inactiveTitlebarAppearance); - - if(opts->shadePopupMenu && SHADE_NONE==opts->shadeMenubars) - opts->shadePopupMenu=false; - - if(opts->shadePopupMenu) - opts->lighterPopupMenuBgnd=0; -#ifdef __cplusplus - -#if defined QT_VERSION && QT_VERSION >= 0x040000 - if(!(opts->titlebarButtons&TITLEBAR_BUTTON_ROUND)) -#endif - opts->titlebarButtonAppearance=MODIFY_AGUA(opts->titlebarButtonAppearance); - opts->dwtAppearance=MODIFY_AGUA(opts->dwtAppearance); -#endif - if(opts->windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR && - (opts->windowBorder&WINDOW_BORDER_BLEND_TITLEBAR || SHADE_WINDOW_BORDER==opts->shadeMenubars)) - opts->windowBorder-=WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR; - - if(APPEARANCE_FLAT==opts->tabAppearance) - opts->tabAppearance=APPEARANCE_RAISED; - if(EFFECT_NONE==opts->buttonEffect) - opts->etchEntry=false; - if(opts->colorSliderMouseOver && - (SHADE_NONE==opts->shadeSliders || SHADE_DARKEN==opts->shadeSliders)) - opts->colorSliderMouseOver=false; -#endif /* ndef CONFIG_DIALOG */ - - if(LINE_1DOT==opts->toolbarSeparators) - opts->toolbarSeparators=LINE_DOTS; - -#ifndef __cplusplus + releaseConfig(cfg); freeOpts(defOpts); #endif return true; @@ -3127,6 +3126,7 @@ CFG_WRITE_APPEARANCE_ENTRY(grooveAppearance, APP_ALLOW_BASIC) CFG_WRITE_APPEARANCE_ENTRY(sunkenAppearance, APP_ALLOW_BASIC) CFG_WRITE_APPEARANCE_ENTRY(sbarBgndAppearance, APP_ALLOW_BASIC) + CFG_WRITE_APPEARANCE_ENTRY(tooltipAppearance, APP_ALLOW_BASIC) CFG_WRITE_ENTRY(sliderFill) CFG_WRITE_ENTRY(progressGrooveColor) CFG_WRITE_ENTRY(focus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/gtkrc new/QtCurve-Gtk2-1.6.2/style/gtkrc --- old/QtCurve-Gtk2-1.6.1/style/gtkrc 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/gtkrc 2010-09-22 21:38:54.000000000 +0200 @@ -1,4 +1,5 @@ gtk-menu-images = 1 +gtk-fallback-icon-theme="gnome" style "qtcurve-default" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/qt_settings.c new/QtCurve-Gtk2-1.6.2/style/qt_settings.c --- old/QtCurve-Gtk2-1.6.1/style/qt_settings.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/qt_settings.c 2010-09-22 21:38:54.000000000 +0200 @@ -2404,6 +2404,63 @@ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED].blue)); gtk_rc_parse_string(tmpStr); } + + if(GTK_APP_OPEN_OFFICE==qtSettings.app) + { + GdkColor *active=NULL, + *inactive=NULL; + + if(SHADE_WINDOW_BORDER==opts.shadeMenubars) + { + active=&qtSettings.colors[PAL_ACTIVE][opts.useHighlightForMenu ? COLOR_TEXT_SELECTED : COLOR_WINDOW_BORDER_TEXT]; + inactive=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER_TEXT]; + } + else if(opts.customMenuTextColor) + { + active=&opts.customMenuSelTextColor; + inactive=&opts.customMenuNormTextColor; + } + else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars || + (SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(qtcPalette.menubar[ORIGINAL_SHADE]))) + { + active=&qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED]; + inactive=&qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED]; + } + + if(active && inactive) + { + static const char *format="style \""RC_SETTING"MnuTxt\"" + " {fg[NORMAL]=\"#%02X%02X%02X\"" + " fg[PRELIGHT]=\"#%02X%02X%02X\"" + " fg[ACTIVE]=\"#%02X%02X%02X\"" + " fg[SELECTED]=\"#%02X%02X%02X\"" + " text[NORMAL]=\"#%02X%02X%02X\"}" + " widget_class \"*<GtkMenuBar>*\" style \""RC_SETTING"MnuTxt\" %s"; + static const char *menutitem=" widget_class \"*<GtkMenuItem>*\" style \""RC_SETTING"MnuTxt\" "; + tmpStr=(char *)realloc(tmpStr, strlen(format)+(opts.shadePopupMenu ? strlen(menutitem) : 1)); + + if(tmpStr) + { + sprintf(tmpStr, format, toQtColor(inactive->red), + toQtColor(inactive->green), + toQtColor(inactive->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(inactive->red), + toQtColor(inactive->green), + toQtColor(inactive->blue), + opts.shadePopupMenu ? menutitem : " "); + gtk_rc_parse_string(tmpStr); + } + } + } } // if(qtSettings.inactiveChangeSelectionColor) @@ -2440,7 +2497,7 @@ if(opts.mapKdeIcons && qtSettings.icons) { - static const char *constFormat="gtk-icon-theme-name=\"%s\" gtk-fallback-icon-theme=\"hicolor\""; + static const char *constFormat="gtk-icon-theme-name=\"%s\""; tmpStr=(char *)realloc(tmpStr, strlen(constFormat)+strlen(qtSettings.icons)+1); sprintf(tmpStr, constFormat, qtSettings.icons); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/qtcurve.c new/QtCurve-Gtk2-1.6.2/style/qtcurve.c --- old/QtCurve-Gtk2-1.6.1/style/qtcurve.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/qtcurve.c 2010-09-22 21:38:54.000000000 +0200 @@ -480,9 +480,10 @@ return GTK_APP_EVOLUTION==qtSettings.app && widget && widget->parent && widget->parent->parent && DETAIL("button") && 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget)), "ECanvas") && - (0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETree") || - 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETable")); - + /*(0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETree") || + 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "MessageList") || + 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETable")) &&*/ + GTK_IS_SCROLLED_WINDOW(widget->parent->parent); } static gboolean isOnListViewHeader(GtkWidget *w, int level) @@ -934,26 +935,6 @@ } #endif -static int progressbarRound(GtkWidget *widget, gboolean rev) -{ - if(!widget || !GTK_IS_PROGRESS_BAR(widget) || isMozilla() || - equal(gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget)), 100.0)) - return ROUNDED_NONE; - - switch(GTK_PROGRESS_BAR(widget)->orientation) - { - default: - case GTK_PROGRESS_LEFT_TO_RIGHT: - return rev ? ROUNDED_LEFT : ROUNDED_RIGHT; - case GTK_PROGRESS_RIGHT_TO_LEFT: - return rev ? ROUNDED_RIGHT : ROUNDED_LEFT; - case GTK_PROGRESS_BOTTOM_TO_TOP: - return ROUNDED_TOP; - case GTK_PROGRESS_TOP_TO_BOTTOM: - return ROUNDED_BOTTOM; - } -} - static gboolean isFixedWidget(GtkWidget *widget) { return widget && widget->parent && widget->parent->parent && @@ -2576,7 +2557,7 @@ if(useAlpha) cairo_set_operator(cr, CAIRO_OPERATOR_OVER); - drawBgndRings(cr, -ypos, window->allocation.width, TRUE); + drawBgndRings(cr, -ypos, window->allocation.width-1, TRUE); unsetCairoClipping(cr); return TRUE; } @@ -2801,9 +2782,8 @@ : qtcPalette.progress ? qtcPalette.progress : qtcPalette.highlight; - int round=opts.fillProgress || isEntryProg ? ROUNDED_ALL : progressbarRound(widget, rev), - new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state; - int fillVal=grayItem ? 4 : ORIGINAL_SHADE, + int new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state, + fillVal=grayItem ? 4 : ORIGINAL_SHADE, borderVal=0; x++, y++, width-=2, height-=2; @@ -2814,7 +2794,7 @@ if((horiz ? width : height)>1) drawLightBevel(cr, style, new_state, area, NULL, x, y, width, height, &itemCols[fillVal], - itemCols, round, wid, BORDER_FLAT, + itemCols, ROUNDED_ALL, wid, BORDER_FLAT, (horiz ? 0 : DF_VERT)|DF_DO_CORNERS, widget); if(opts.stripedProgress && width>4 && height>4) @@ -2828,7 +2808,7 @@ else drawLightBevel(cr, style, new_state, NULL, region, x, y, width, height, &itemCols[1], - qtcPalette.highlight, round, wid, BORDER_FLAT, + qtcPalette.highlight, ROUNDED_ALL, wid, BORDER_FLAT, (opts.fillProgress || !opts.borderProgress ? 0 : DF_DO_BORDER)|(horiz ? 0 : DF_VERT)|DF_DO_CORNERS, widget); if(opts.glowProgress && (horiz ? width : height)>3) @@ -2877,31 +2857,7 @@ if(width>2 && height>2 && opts.borderProgress) realDrawBorder(cr, style, state, area, NULL, x, y, width, height, - itemCols, round, BORDER_FLAT, wid, 0, PBAR_BORDER); - if(!opts.fillProgress && ROUNDED && ROUNDED_ALL!=round && width>4 && height>4 && opts.borderProgress) - { - /*if(!isMozilla()) - { - x--; y--; width+=2; height+=2; - }*/ - cairo_new_path(cr); - if(opts.fillProgress) - { - x++, y++, width-=2, height-=2; - cairo_set_source_rgb(cr, CAIRO_COL(qtcPalette.background[STD_BORDER])); - } - else - cairo_set_source_rgba(cr, CAIRO_COL(qtcPalette.background[ORIGINAL_SHADE]), 0.75); - if(!(round&CORNER_TL)) - cairo_rectangle(cr, x, y, 1, 1); - if(!(round&CORNER_TR)) - cairo_rectangle(cr, x+width-1, y, 1, 1); - if(!(round&CORNER_BR)) - cairo_rectangle(cr, x+width-1, y+height-1, 1, 1); - if(!(round&CORNER_BL)) - cairo_rectangle(cr, x, y+height-1, 1, 1); - cairo_fill(cr); - } + itemCols, ROUNDED_ALL, BORDER_FLAT, wid, 0, PBAR_BORDER); if(!opts.borderProgress) if(horiz) @@ -3230,7 +3186,7 @@ #if GTK_CHECK_VERSION(2,9,0) double radius=0; gboolean nonGtk=isMozilla() || GTK_APP_OPEN_OFFICE==qtSettings.app || GTK_APP_JAVA==qtSettings.app, - rounded=!nonGtk && widget && !(opts.square&SQUARE_TOOLTIPS) && opts.round>=ROUND_FULL; + rounded=!nonGtk && widget && !(opts.square&SQUARE_TOOLTIPS); if(!nonGtk && GTK_IS_WINDOW(widget)) gtk_window_set_opacity(GTK_WINDOW(widget), 0.875); @@ -3240,7 +3196,7 @@ int size=((width&0xFFFF)<<16)+(height&0xFFFF), old=(int)g_object_get_data(G_OBJECT(widget), "QTC_WIDGET_MASK"); - radius=5.0; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); + radius=MENU_AND_TOOLTIP_RADIUS; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); if(size!=old) { @@ -4916,10 +4872,11 @@ } else if(!opts.borderMenuitems && !mb && menuitem) { + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ gboolean roundedMenu=(!widget || !isComboMenu(widget->parent)) && !(opts.square&SQUARE_POPUP_MENUS); if(roundedMenu) - clipPathRadius(cr, x, y, width, height, 4, round); + clipPathRadius(cr, x, y, width, height, MENU_AND_TOOLTIP_RADIUS-1.0, round); drawBevelGradient(cr, style, area, region, x, y, width, height, &itemCols[fillVal], TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); if(roundedMenu) @@ -4950,15 +4907,16 @@ else if(DETAIL("menu")) { gboolean comboMenu=isComboMenu(widget), - roundedMenu=!comboMenu && !(opts.square&SQUARE_POPUP_MENUS); + roundedMenu=/*!comboMenu &&*/ !(opts.square&SQUARE_POPUP_MENUS); double radius=0.0; - if(roundedMenu) + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ + if(roundedMenu && !comboMenu) { int size=((width&0xFFFF)<<16)+(height&0xFFFF), old=(int)g_object_get_data(G_OBJECT(widget), "QTC_WIDGET_MASK"); - radius=5; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); + radius=MENU_AND_TOOLTIP_RADIUS; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); if(size!=old) { GdkBitmap *mask=gdk_pixmap_new(NULL, width, height, 1); @@ -4981,10 +4939,10 @@ clipPath(cr, x, y, width, height, WIDGET_OTHER, radius+1, ROUNDED_ALL); } - if(widget && !comboMenu && 100!=opts.menuBgndOpacity && !isFixedWidget(widget) && isRgbaWidget(widget)) + if(widget && /*!comboMenu && */100!=opts.menuBgndOpacity && !isFixedWidget(widget) && isRgbaWidget(widget)) enableBlurBehind(widget, TRUE); - if(!comboMenu && !IS_FLAT_BGND(opts.menuBgndAppearance)) + if(/*!comboMenu && */!IS_FLAT_BGND(opts.menuBgndAppearance)) { double alpha=1.0; gboolean useAlpha=opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); @@ -5006,7 +4964,7 @@ else if(opts.shadePopupMenu || USE_LIGHTER_POPUP_MENU) { double alpha=1.0; - gboolean useAlpha=!comboMenu && opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); + gboolean useAlpha=/*!comboMenu && */opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); if(useAlpha) { @@ -5018,7 +4976,7 @@ cairo_set_operator(cr, CAIRO_OPERATOR_OVER); } - if(!comboMenu && IMG_NONE!=opts.menuBgndImage.type) + if(/*!comboMenu && */IMG_NONE!=opts.menuBgndImage.type) drawBgndRings(cr, y, width, FALSE); if(opts.menuStripe && !comboMenu) @@ -5066,17 +5024,18 @@ &opts.customMenuStripeColor, FALSE, FALSE, opts.menuStripeAppearance, WIDGET_OTHER); } - if(opts.popupBorder || roundedMenu) + if(opts.popupBorder) { GdkColor *cols=USE_LIGHTER_POPUP_MENU || opts.shadePopupMenu ? qtcPalette.menu : qtcPalette.background; - if(roundedMenu) + if(roundedMenu && !comboMenu) unsetCairoClipping(cr); cairo_new_path(cr); cairo_set_source_rgb(cr, CAIRO_COL(cols[STD_BORDER])); - if(roundedMenu) + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ + if(roundedMenu && !comboMenu) createPath(cr, x+0.5, y+0.5, width-1, height-1, radius-1, ROUNDED_ALL); else cairo_rectangle(cr, x+0.5, y+0.5, width-1, height-1); @@ -7290,6 +7249,9 @@ } else if(isGimpCombo(widget)) { + if(FOCUS_GLOW==opts.focus) + return; + x-=2, width+=4; if(!doEtch) x--, y--, width+=2, height+=2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/window.c new/QtCurve-Gtk2-1.6.2/style/window.c --- old/QtCurve-Gtk2-1.6.1/style/window.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/window.c 2010-09-22 21:38:54.000000000 +0200 @@ -266,9 +266,9 @@ gdk_x11_get_xatom_by_name_for_display(display, OPACITY_ATOM), XA_CARDINAL, 16, PropModeReplace, (unsigned char *)&opacity, 1); - if(!IS_FLAT_BGND(opts.bgndAppearance)) + if(!IS_FLAT_BGND(opts.bgndAppearance) || IMG_NONE!=opts.bgndImage.type) { - unsigned short app=opts.bgndAppearance; + unsigned short app=IS_FLAT_BGND(opts.bgndAppearance) ? APPEARANCE_RAISED : opts.bgndAppearance; XChangeProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XID(GTK_WIDGET(topLevel)->window), gdk_x11_get_xatom_by_name_for_display(display, BGND_ATOM), XA_CARDINAL, 16, PropModeReplace, (unsigned char *)&app, 1); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libx86 for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package libx86 for openSUSE:Factory checked in at Sun Sep 26 21:41:10 CEST 2010. -------- --- libx86/libx86.changes 2010-09-20 15:28:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/libx86/libx86.changes 2010-09-24 17:33:51.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 24 15:33:17 UTC 2010 - aj(a)suse.de + +- Fix obsoletes, it needs to be a <= since the version number stayed + the same. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libx86.spec ++++++ --- /var/tmp/diff_new_pack.RZhxeR/_old 2010-09-26 21:40:49.000000000 +0200 +++ /var/tmp/diff_new_pack.RZhxeR/_new 2010-09-26 21:40:49.000000000 +0200 @@ -21,7 +21,7 @@ Name: libx86 Url: http://www.codon.org.uk/~mjg59/libx86 Version: 1.1 -Release: 25 +Release: 26 Summary: x86 real-mode library License: BSD3c Group: System/Libraries @@ -48,7 +48,7 @@ Group: Development/Libraries/C and C++ Summary: x86 real-mode library Provides: libx86 = %{version} -Obsoletes: libx86 < %{version} +Obsoletes: libx86 <= %{version} %description -n libx86-1 A library to provide support for making real-mode calls x86 calls. On ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_conntrack for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package libnetfilter_conntrack for openSUSE:Factory checked in at Sun Sep 26 21:40:15 CEST 2010. -------- --- libnetfilter_conntrack/libnetfilter_conntrack.changes 2010-02-23 23:16:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnetfilter_conntrack/libnetfilter_conntrack.changes 2010-09-09 01:14:44.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Sep 8 22:47:11 UTC 2010 - jengelh(a)medozas.de + +- new upstream release 0.9.0 +* ct: fix regression with helpers for Linux kernel >= 2.6.34 +* ct: fix EINVAL if not TCP attributes are set for Linux + kernel <= 2.6.25 + +------------------------------------------------------------------- +Thu Jul 15 19:44:54 UTC 2010 - jengelh(a)medozas.de + +- new upstream release 0.0.102 + * support for conntrack zones + * support for TCP window scale factor + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnetfilter_conntrack-0.0.101.tar.bz2 New: ---- libnetfilter_conntrack-0.9.0.tar.bz2 libnetfilter_conntrack-0.9.0.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_conntrack.spec ++++++ --- /var/tmp/diff_new_pack.kII31m/_old 2010-09-26 21:38:58.000000000 +0200 +++ /var/tmp/diff_new_pack.kII31m/_new 2010-09-26 21:38:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libnetfilter_conntrack (Version 0.0.101) +# spec file for package libnetfilter_conntrack (Version 0.9.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,15 +20,17 @@ %define soname 3 Name: libnetfilter_conntrack -Version: 0.0.101 +Version: 0.9.0 Release: 1 License: GNU GPL v2 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_conntrack/ -Source: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{versio… -Source2: baselibs.conf +Source: http://netfilter.org/projects/%name/files/%name-%version.tar.bz2 +Source2: http://netfilter.org/projects/%name/files/%name-%version.tar.bz2.sig +Source3: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libnfnetlink-devel linux-kernel-headers >= 2.6.14 pkg-config +BuildRequires: libnfnetlink-devel >= 1.0.0 +BuildRequires: linux-kernel-headers >= 2.6.18 pkg-config Summary: Userspace library for the in-kernel connection tracking state table %description @@ -42,6 +44,7 @@ %package -n %{name}%{soname} + Group: System/Libraries Summary: Userspace library for the in-kernel connection tracking state table @@ -54,6 +57,7 @@ %package -n %{name}-devel + Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} Summary: Userspace library for the in-kernel connection tracking state table ++++++ libnetfilter_conntrack-0.0.101.tar.bz2 -> libnetfilter_conntrack-0.9.0.tar.bz2 ++++++ ++++ 3732 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkate for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package libkate for openSUSE:Factory checked in at Sun Sep 26 21:38:21 CEST 2010. -------- --- GNOME/libkate/libkate.changes 2010-09-21 20:34:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/libkate/libkate.changes 2010-09-26 13:22:59.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Sep 26 10:43:09 UTC 2010 - dimstar(a)opensuse.org + +- Fix build on openSUSE 11.1 by defining the python_site* macros. + +------------------------------------------------------------------- +Fri Sep 24 01:31:34 UTC 2010 - reddwarf(a)opensuse.org + +- Make katedj noarch. +- Add Requires for various oggz tools to katedj. +- Use fdupes. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkate.spec ++++++ --- /var/tmp/diff_new_pack.R5wVbG/_old 2010-09-26 21:37:51.000000000 +0200 +++ /var/tmp/diff_new_pack.R5wVbG/_new 2010-09-26 21:37:51.000000000 +0200 @@ -20,18 +20,23 @@ Name: libkate Version: 0.3.8 -Release: 1 +Release: 2 License: BSD3c ; Other uncritical OpenSource License Summary: A karaoke and text codec for embedding in Ogg Url: http://libkate.googlecode.com Group: Productivity/Multimedia/Other Source: %{name}-%{version}.tar.bz2 BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: libogg-devel BuildRequires: libpng-devel BuildRequires: pkg-config BuildRequires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version <= 1110 +%define python_sitelib %{py_sitedir} +%define python_sitearch %{py_sitedir} +%endif %description Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -47,7 +52,6 @@ %package -n %{name}1 - License: BSD3c ; Other uncritical OpenSource License Summary: A karaoke and text codec for embedding in Ogg Group: System/Libraries @@ -107,7 +111,11 @@ Group: Productivity/Multimedia/Other Requires: %{name}-tools = %{version} Requires: python-wxGTK +Requires: %{_bindir}/oggz-merge +Requires: %{_bindir}/oggz-rip %py_requires +Recommends: %{_bindir}/oggz-known-codecs +BuildArch: noarch %description -n katedj KateDJ allows extracting Kate tracks embedded in an Ogg stream, editing @@ -126,6 +134,7 @@ find %{buildroot} -type f -name "*.la" -delete -print # Remove files that we install with %doc rm -rf %{buildroot}%{_datadir}/doc/%{name}/{AUTHORS,COPYING,ChangeLog,README,THANKS,html} +%fdupes %{buildroot}%{python_sitelib}/kdj %post -n %{name}1 -p /sbin/ldconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Sun Sep 26 21:36:04 CEST 2010. -------- --- installation-images/installation-images.changes 2010-09-10 14:56:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-09-24 15:16:41.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 24 15:15:25 CEST 2010 - snwint(a)suse.de + +- fix building of initrd & rescue image + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.63.tar.bz2 needed_space_in_mb New: ---- installation-images-12.64.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.2vw9gr/_old 2010-09-26 21:34:26.000000000 +0200 +++ /var/tmp/diff_new_pack.2vw9gr/_new 2010-09-26 21:34:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.63) +# spec file for package installation-images (Version 12.64) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ BuildRequires: aaa_base audit-libs busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite libcares2 libelf0 libzypp open-iscsi openct pciutils pciutils-ids pcsc-lite perl-HTML-Parser sqlite3 util-linux BuildRequires: build-key gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare perl-XML-NamespaceSupport perl-XML-Parser perl-XML-Simple yast2-iscsi-client yast2-ncurses BuildRequires: Mesa libXi6 xkeyboard-config xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm -BuildRequires: bzip2 cracklib cracklib-dict-full curl gpart iproute2 libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel librpcsecgss module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc reiserfs satsolver-tools squashfs strace vim xntp xz yast2-devtools +BuildRequires: bzip2 cracklib cracklib-dict-full curl gpart iproute2 libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc reiserfs satsolver-tools squashfs strace vim xntp xz yast2-devtools BuildRequires: alsa alsa-utils bind-libs bind-utils chkrootkit espeak lsscsi openldap2-client portaudio portmap python rpcbind sdparm smp_utils uuid-runtime xorg-x11-xauth yast2-multipath BuildRequires: btrfsprogs cairo graphviz graphviz-gnome kernel-default kernel-firmware libiw30 pango sax2-tools unscd valgrind wireless-tools wpa_supplicant yast2-qt-graph %if %has_vnc @@ -109,9 +109,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.63 +Version: 12.64 Release: 1 -Source: installation-images-12.63.tar.bz2 +Source: installation-images-12.64.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -195,7 +195,7 @@ # careful: will make all non-matching initrds fail hard # export instsys_complain_root=2 # beta only: ignore non-critical errors -# export debug=ignore +export debug=ignore %if %has_sles make %else ++++++ installation-images-12.63.tar.bz2 -> installation-images-12.64.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.63/VERSION new/installation-images-12.64/VERSION --- old/installation-images-12.63/VERSION 2010-09-10 14:56:16.000000000 +0200 +++ new/installation-images-12.64/VERSION 2010-09-24 15:15:17.000000000 +0200 @@ -1 +1 @@ -12.63 +12.64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.63/changelog new/installation-images-12.64/changelog --- old/installation-images-12.63/changelog 2010-09-10 14:56:19.000000000 +0200 +++ new/installation-images-12.64/changelog 2010-09-24 15:15:20.000000000 +0200 @@ -1,4 +1,7 @@ -2010-09-10: HEAD +2010-09-24: HEAD + - fix building of initrd & rescue image + +2010-09-10: 12.63 - adjust to new kernel - change product to 11.4 - remmove floppy-READMEs (bnc #614013) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.63/data/initrd/initrd.file_list new/installation-images-12.64/data/initrd/initrd.file_list --- old/installation-images-12.63/data/initrd/initrd.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.64/data/initrd/initrd.file_list 2010-09-24 14:38:01.000000000 +0200 @@ -4,13 +4,10 @@ d var/run/dbus var/run/hotplug var/cache/fontconfig d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/lib/sax - d etc/sysconfig d etc/sysconfig/hardware d etc/YaST2 - d var/lib/xkb/compiled etc/X11 - d mounts d root d download @@ -51,45 +48,41 @@ b 7 7 /dev/loop7 c 660 0 6 /dev/loop7 -# historical static device nodes -x devz /devz -aaa_base: prein - e prein - # keep only passwd & group - r boot - r etc/init.d - r etc/mtab - r var/adm/fillup-templates - /etc/rc.status - -dbus-1: prein - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - -openssh: prein - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - d etc/ssh +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages without scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -glibc: - /etc/nsswitch.conf - - linuxrc: - if linuxrc - if linuxrc =~ m#^[^/]# - m /usr/sbin/<linuxrc> /init - else - X <linuxrc> /init - endif +linuxrc: + if linuxrc + if linuxrc =~ m#^[^/]# + m /usr/sbin/<linuxrc> /init else - m /usr/sbin/linuxrc /init + X <linuxrc> /init endif - s /lbin/extend /bin + else + m /usr/sbin/linuxrc /init + endif + s /lbin/extend /bin + d usr/share/kbd/consolefonts + g /usr/share/linuxrc/linuxrc-16.psfu.gz usr/share/kbd/consolefonts/linuxrc-16.psfu + g /usr/share/linuxrc/linuxrc2-16.psfu.gz usr/share/kbd/consolefonts/linuxrc2-16.psfu - x etc/syslog.conf etc +glibc: + /etc/nsswitch.conf + /etc/ld.so.conf + /lib*/ld* + /lib*/libc{.,-}* + /lib*/{libcrypt,libdl,libnsl,libresolv}{.,-}* + /lib*/{libnss_compat,libnss_dns,libnss_files,libnss_hesiod}{.,-}* + /lib*/libm{.,-}* + /lib*/libthread_db{.,-}* + /lib*/libutil{.,-}* + /lib*/librt{.,-}* + /lib*/libpthread{.,-}* + /usr/bin/getent libselinux1: / @@ -99,148 +92,9 @@ /sbin/insmod /sbin/modprobe -x etc/host.conf etc - -if arch ne 's390' && arch ne 's390x' - -kbd: - /bin/dumpkeys - /bin/loadkeys - /bin/setfont - - d usr/share/kbd/consoletrans -if arch ne 'sparc' && arch ne 'sparc64' - m /usr/share/kbd/consoletrans/koi2alt usr/share/kbd/consoletrans -endif - m /usr/share/kbd/consoletrans/trivial usr/share/kbd/consoletrans - - d usr/share/kbd/consolefonts - -if 0 - g /usr/share/kbd/consolefonts/LatArCyrHeb-16.psfu.gz usr/share/kbd/consolefonts/LatArCyrHeb-16.psfu - g /usr/share/kbd/consolefonts/lat1-16.psfu.gz usr/share/kbd/consolefonts/lat1-16.psfu - g /usr/share/kbd/consolefonts/lat2-16.psfu.gz usr/share/kbd/consolefonts/lat2-16.psfu - g /usr/share/kbd/consolefonts/iso07u-16.psfu.gz usr/share/kbd/consolefonts/lat7-16.psfu - g /usr/share/kbd/consolefonts/Cyr_a8x16.psfu.gz usr/share/kbd/consolefonts/Cyr_a8x16.psfu -endif - -linuxrc: - g /usr/share/linuxrc/linuxrc-16.psfu.gz usr/share/kbd/consolefonts/linuxrc-16.psfu - g /usr/share/linuxrc/linuxrc2-16.psfu.gz usr/share/kbd/consolefonts/linuxrc2-16.psfu - -kbd: - - /usr/share/kbd/keymaps - -if 0 - -if arch ne 'sparc' && arch ne 'sparc64' - d usr/share/kbd/keymaps/include - m usr/share/kbd/keymaps/include/compose.latin1 usr/share/kbd/keymaps/include -endif - -if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ppc' || arch eq 'ppc64' || arch eq 'ia64' || arch eq 'mips' - if !fewkeymaps - g /usr/share/kbd/keymaps/i386/qwerty/Pl02.map.gz usr/share/kbd/keymaps/Pl02.map - g /usr/share/kbd/keymaps/i386/qwerty/br-abnt2.map.gz usr/share/kbd/keymaps/br-abnt2.map - g /usr/share/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz usr/share/kbd/keymaps/cz-us-qwertz.map - g /usr/share/kbd/keymaps/i386/qwerty/dk.map.gz usr/share/kbd/keymaps/dk.map - g /usr/share/kbd/keymaps/i386/qwerty/es.map.gz usr/share/kbd/keymaps/es.map - g /usr/share/kbd/keymaps/i386/qwerty/gr.map.gz usr/share/kbd/keymaps/gr.map - g /usr/share/kbd/keymaps/i386/qwertz/hu.map.gz usr/share/kbd/keymaps/hu.map - g /usr/share/kbd/keymaps/i386/qwerty/it.map.gz usr/share/kbd/keymaps/it.map - g /usr/share/kbd/keymaps/i386/qwerty/jp106.map.gz usr/share/kbd/keymaps/jp106.map - g /usr/share/kbd/keymaps/i386/qwerty/nl.map.gz usr/share/kbd/keymaps/nl.map - g /usr/share/kbd/keymaps/i386/qwerty/no-latin1.map.gz usr/share/kbd/keymaps/no-latin1.map - g /usr/share/kbd/keymaps/i386/qwerty/pt-latin1.map.gz usr/share/kbd/keymaps/pt-latin1.map - g /usr/share/kbd/keymaps/i386/qwerty/ru1.map.gz usr/share/kbd/keymaps/ru1.map - g /usr/share/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz usr/share/kbd/keymaps/sk-qwerty.map - g /usr/share/kbd/keymaps/i386/qwertz/slovene.map.gz usr/share/kbd/keymaps/slovene.map - g /usr/share/kbd/keymaps/i386/qwerty/sv-latin1.map.gz usr/share/kbd/keymaps/sv-latin1.map - g /usr/share/kbd/keymaps/i386/qwerty/fi-latin1.map.gz usr/share/kbd/keymaps/fi-latin1.map - g /usr/share/kbd/keymaps/i386/qwerty/uk.map.gz usr/share/kbd/keymaps/uk.map - g /usr/share/kbd/keymaps/i386/azerty/fr-latin1.map.gz usr/share/kbd/keymaps/fr-latin1.map - g /usr/share/kbd/keymaps/i386/azerty/be-latin1.map.gz usr/share/kbd/keymaps/be-latin1.map - - m /usr/share/kbd/keymaps/i386/include/linux-with-modeshift-altgr.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/linux-keys-extd.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/azerty-layout.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/linux-with-two-alt-keys.inc usr/share/kbd/keymaps/include - endif - - g /usr/share/kbd/keymaps/i386/qwerty/us.map.gz usr/share/kbd/keymaps/us.map - g /usr/share/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz usr/share/kbd/keymaps/de-lat1-nd.map - g /usr/share/kbd/keymaps/i386/qwertz/de-latin1.map.gz usr/share/kbd/keymaps/de-latin1.map - - m /usr/share/kbd/keymaps/i386/include/linux-keys-bare.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/linux-with-alt-and-altgr.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/qwerty-layout.inc usr/share/kbd/keymaps/include - m /usr/share/kbd/keymaps/i386/include/qwertz-layout.inc usr/share/kbd/keymaps/include - g /usr/share/kbd/keymaps/i386/include/euro1.map.gz usr/share/kbd/keymaps/include/euro1.map - g /usr/share/kbd/keymaps/i386/include/euro2.map.gz usr/share/kbd/keymaps/include/euro2.map -endif - -if arch eq 'ppc' || arch eq 'ppc64' - m /usr/share/kbd/keymaps/mac/include/mac-{azerty-layout,qwert{y,z}-layout,linux-keys-bare}.inc usr/share/kbd/keymaps/include - g /usr/share/kbd/keymaps/mac/include/mac-euro.map.gz usr/share/kbd/keymaps/include/mac-euro.map - g /usr/share/kbd/keymaps/mac/include/mac-euro2.map.gz usr/share/kbd/keymaps/include/mac-euro2.map - g /usr/share/kbd/keymaps/mac/all/mac-be.map.gz usr/share/kbd/keymaps/mac-be.map - g /usr/share/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz usr/share/kbd/keymaps/mac-de-latin1-nodeadkeys.map - g /usr/share/kbd/keymaps/mac/all/mac-de-latin1.map.gz usr/share/kbd/keymaps/mac-de-latin1.map - g /usr/share/kbd/keymaps/mac/all/mac-de_CH.map.gz usr/share/kbd/keymaps/mac-de_CH.map - g /usr/share/kbd/keymaps/mac/all/mac-dk-latin1.map.gz usr/share/kbd/keymaps/mac-dk-latin1.map - g /usr/share/kbd/keymaps/mac/all/mac-es.map.gz usr/share/kbd/keymaps/mac-es.map - g /usr/share/kbd/keymaps/mac/all/mac-fi-latin1.map.gz usr/share/kbd/keymaps/mac-fi-latin1.map - g /usr/share/kbd/keymaps/mac/all/mac-fr.map.gz usr/share/kbd/keymaps/mac-fr.map - g /usr/share/kbd/keymaps/mac/all/mac-it.map.gz usr/share/kbd/keymaps/mac-it.map - g /usr/share/kbd/keymaps/mac/all/mac-se.map.gz usr/share/kbd/keymaps/mac-se.map - g /usr/share/kbd/keymaps/mac/all/mac-uk.map.gz usr/share/kbd/keymaps/mac-uk.map - g /usr/share/kbd/keymaps/mac/all/mac-us.map.gz usr/share/kbd/keymaps/mac-us.map -endif - -if arch eq 'sparc' || arch eq 'sparc64' - d usr/share/kbd/keymaps - g /usr/share/kbd/keymaps/sun/sunkeymap.map.gz usr/share/kbd/keymaps/sunkeymap.map - g /usr/share/kbd/keymaps/sun/sunt4-es.map.gz usr/share/kbd/keymaps/sunt4-es.map - g /usr/share/kbd/keymaps/sun/sunt4-fi-latin1.map.gz usr/share/kbd/keymaps/sunt4-fi-latin1.map - g /usr/share/kbd/keymaps/sun/sunt4-no-latin1.map.gz usr/share/kbd/keymaps/sunt4-no-latin1.map - g /usr/share/kbd/keymaps/sun/sunt5-de-latin1.map.gz usr/share/kbd/keymaps/sunt5-de-latin1.map - g /usr/share/kbd/keymaps/sun/sunt5-es.map.gz usr/share/kbd/keymaps/sunt5-es.map - g /usr/share/kbd/keymaps/sun/sunt5-fi-latin1.map.gz usr/share/kbd/keymaps/sunt5-fi-latin1.map - g /usr/share/kbd/keymaps/sun/sunt5-fr-latin1.map.gz usr/share/kbd/keymaps/sunt5-fr-latin1.map - g /usr/share/kbd/keymaps/sun/sunt5-ru.map.gz usr/share/kbd/keymaps/sunt5-ru.map - g /usr/share/kbd/keymaps/sun/sunt5-uk.map.gz usr/share/kbd/keymaps/sunt5-uk.map -endif - -endif - -endif # not on s390 - -# really ??? -if (arch eq 's390' || arch eq 's390x') && 0 - - pam: - /lib*/libpam.so.* - - libaudit*: - /lib*/libaudit.so.* - - cups-libs: - m /usr/lib*/libcups.so.* /lib - - e2fsprogs: - m /lib*/lib*.so.* /lib - - libcom_err2: - m /lib*/libcom_err.so.* /lib - m /lib*/libss.so.* /lib - - db: - m /usr/lib*/libdb-4*.so /lib - -endif if arch eq 's390' || arch eq 's390x' + s390-tools: /sbin/zfcp_*_configure /sbin/zfcp_san_disc @@ -249,8 +103,20 @@ /sbin/qeth_configure /sbin/dasdinfo /etc/udev + +else + + kbd: + /bin/dumpkeys + /bin/loadkeys + /bin/setfont + /usr/share/kbd/keymaps + /usr/share/kbd/consoletrans/koi2alt + /usr/share/kbd/consoletrans/trivial + endif + sed: /bin/sed @@ -261,101 +127,6 @@ lsscsi: /usr/bin/lsscsi -if with_gdb - - valgrind: - / - - kbd: - /bin/kbd_mode - - strace: - /usr/bin/strace - - gdb: - /usr/bin/gdb - - libpython2_6-1_0: - /usr/lib* - - libexpat1: - /lib*/libexpat.so.* - - procps: - /bin/ps - - psmisc: - /bin/fuser - /usr/bin/killall - /usr/bin/pstree - - coreutils: - /usr/bin/head - /usr/bin/tail - - if linuxrc eq "" - linuxrc-debuginfo: - / - endif - - if with_gdb == 2 - - linuxrc: - e mv init sbin - - e echo -e "#! /bin/sh\nexport PATH=/bin:/usr/bin:/sbin:/usr/sbin:/lbin\nPS1=\\\\\\w\>\n/bin/bash\n" >init - c 755 0 0 init - endif - - if with_gdb == 3 - - linuxrc: - e mv init sbin - - e echo run >zap - e echo -e "#! /bin/sh\ngdb --command /zap /sbin/init" >init - c 755 0 0 init - - endif - - - d /lbin - s /init /lbin/cp - s /init /lbin/mv - s /init /lbin/modprobe - s /init /lbin/rmmod - s /init /lbin/lsmod - s /init /lbin/mount - s /init /lbin/umount - s /init /lbin/cat - s /init /lbin/hex - s /init /lbin/lsof - s /init /lbin/rm - s /init /lbin/ln - s /init /lbin/ls - s /init /lbin/mkdevs - s /init /lbin/mkdir - s /init /lbin/chroot - s /init /lbin/kill - s /init /lbin/swapoff - s /init /lbin/free - s /init /lbin/fstype - s /init /lbin/lndir - -endif - - -glibc: - /lib*/ld* - /lib*/libc{.,-}* - /lib*/{libcrypt,libdl,libnsl,libresolv}{.,-}* - /lib*/{libnss_compat,libnss_dns,libnss_files,libnss_hesiod}{.,-}* - /lib*/libm{.,-}* - /lib*/libthread_db{.,-}* - /lib*/libutil{.,-}* - /lib*/librt{.,-}* - /lib*/libpthread{.,-}* - cifs-utils: /sbin/mount.cifs @@ -387,19 +158,22 @@ / endif -if arch eq 'ia64' || arch eq 'i386' || arch eq 'x86_64' +if exists(acpica) acpica: /usr/sbin/acpidump +endif + +if exists(dmidecode) dmidecode: /usr/sbin/dmidecode endif -if arch eq 'i386' || arch eq 'x86_64' +if exists(bootsplash) bootsplash: /sbin/splash endif -if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ppc' || arch eq 'ppc64' +if exists(wpa_supplicant) wpa_supplicant: /usr/sbin @@ -412,9 +186,7 @@ r /usr/sbin/switch_prism_driver r /usr/sbin/install_acx100_firmware r /usr/sbin/install_intersil_firmware - endif -# i386/x86_64/ppc libopenssl*: /lib*/libcrypto.so.* @@ -469,6 +241,10 @@ /bin/true /bin/false /bin/uname + /bin/touch + /bin/date + /bin/mv + /bin/chmod pcmciautils: / @@ -577,36 +353,6 @@ libudev0: /lib* -udev: - e save_cfg etc/passwd etc/shadow etc/group - e groupadd -r tape - e restore_cfg etc/passwd etc/shadow etc/group - - /etc - /lib/udev - /sbin -x etc/myudevstart /bin - # add some md devices statically - b 9 0 /lib/udev/devices/md0 - b 9 1 /lib/udev/devices/md1 - b 9 2 /lib/udev/devices/md2 - b 9 3 /lib/udev/devices/md3 - b 9 4 /lib/udev/devices/md4 - b 9 5 /lib/udev/devices/md5 - b 9 6 /lib/udev/devices/md6 - b 9 7 /lib/udev/devices/md7 - b 9 8 /lib/udev/devices/md8 - b 9 9 /lib/udev/devices/md9 - b 9 10 /lib/udev/devices/md10 - b 9 11 /lib/udev/devices/md11 - b 9 12 /lib/udev/devices/md12 - b 9 13 /lib/udev/devices/md13 - b 9 14 /lib/udev/devices/md14 - b 9 15 /lib/udev/devices/md15 - -# our own rules file which loads only pnp subsystem mods - x etc/80-drivers.rules /lib/udev/80-drivers.rules.no_modprobe - sysconfig: # for ipw3945d /etc/udev/rules.d/*-network.rules @@ -650,16 +396,6 @@ squashfs: /usr/bin/mksquashfs -if 0 -# requires libxml2! -bind-utils: - /usr/bin - -bind-libs: - /usr/lib* - -endif - libcap2: /lib* @@ -670,14 +406,13 @@ /usr/bin/joe /etc/joe/{joerc,ftyperc} -if arch eq 'i386' || arch eq 'x86_64' +if exists(sbl) sbl: /etc /usr/sbin /usr/lib* r /etc/sbl/profile/default s y2base /etc/sbl/profile/default - endif libgcc45: @@ -692,7 +427,7 @@ unscd: # remaining files are in root image - /var/run/nscd + d /var/run/nscd if exists(virtualbox-ose-guest-tools) virtualbox-ose-guest-tools: @@ -709,13 +444,6 @@ /etc/modprobe.d endif -if 0 -if exists(xen-kmp-default) - xen-kmp-default: - /etc -endif -endif - mdadm: / @@ -732,41 +460,172 @@ /etc/udev/rules.d /var/cache/multipath -if 0 +# - - - -# add alsa -alsa: - / +pwdutils: + /etc + /usr/sbin/groupadd + /usr/sbin/groupadd.local + /usr/sbin/useradd + /usr/sbin/useradd.local + /usr/lib*/pwdutils/liblog_syslog.so.* + d /etc/skel -alsa-utils: - / +pam: + /sbin + /etc + /lib*/libpam*.so.* + /lib*/security/pam_group.so + /lib*/security/pam_unix*.so + /lib*/security/pam_env.so + /lib*/security/pam_limits.so + /lib*/security/pam_umask.so + /lib*/security/pam_rootok.so + /lib*/security/pam_permit.so + /lib*/security/pam_deny.so -libasound2: +libnscd: / -espeak: +libaudit1: / -portaudio: - / +libxcrypt: + /lib*/libxcrypt.so.* -libjack0: - / -speechd: - / +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages with scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -libglib-2_0-0: - / +aaa_base: prein + E prein + # keep only passwd & group + r boot + r etc/init.d + r etc/mtab + r var/adm/fillup-templates + /etc/rc.status -libgthread-2_0-0: - / +dbus-1: prein + E prein -dotconf-devel: - /usr/lib*/libdotconf-1.0.so.* +openssh: prein + E prein + d etc/ssh -libgmodule-2_0-0: - / +udev: + /etc + /lib/udev + /sbin + E groupadd -r tape + + # add some md devices statically + b 9 0 /lib/udev/devices/md0 + b 9 1 /lib/udev/devices/md1 + b 9 2 /lib/udev/devices/md2 + b 9 3 /lib/udev/devices/md3 + b 9 4 /lib/udev/devices/md4 + b 9 5 /lib/udev/devices/md5 + b 9 6 /lib/udev/devices/md6 + b 9 7 /lib/udev/devices/md7 + b 9 8 /lib/udev/devices/md8 + b 9 9 /lib/udev/devices/md9 + b 9 10 /lib/udev/devices/md10 + b 9 11 /lib/udev/devices/md11 + b 9 12 /lib/udev/devices/md12 + b 9 13 /lib/udev/devices/md13 + b 9 14 /lib/udev/devices/md14 + b 9 15 /lib/udev/devices/md15 + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# optional extra packages +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +if with_gdb + valgrind: + / + + kbd: + /bin/kbd_mode + + strace: + /usr/bin/strace + + gdb: + /usr/bin/gdb + + libpython2_6-1_0: + /usr/lib* + + libexpat1: + /lib*/libexpat.so.* + + procps: + /bin/ps + + psmisc: + /bin/fuser + /usr/bin/killall + /usr/bin/pstree + + coreutils: + /usr/bin/head + /usr/bin/tail + + if linuxrc eq "" + linuxrc-debuginfo: + / + endif + + if with_gdb == 2 + + linuxrc: + e mv init sbin + + e echo -e "#! /bin/sh\nexport PATH=/bin:/usr/bin:/sbin:/usr/sbin:/lbin\nPS1=\\\\\\w\>\n/bin/bash\n" >init + c 755 0 0 init + endif + + if with_gdb == 3 + + linuxrc: + e mv init sbin + + e echo run >zap + e echo -e "#! /bin/sh\ngdb --command /zap /sbin/init" >init + c 755 0 0 init + + endif + + + d /lbin + s /init /lbin/cp + s /init /lbin/mv + s /init /lbin/modprobe + s /init /lbin/rmmod + s /init /lbin/lsmod + s /init /lbin/mount + s /init /lbin/umount + s /init /lbin/cat + s /init /lbin/hex + s /init /lbin/lsof + s /init /lbin/rm + s /init /lbin/ln + s /init /lbin/ls + s /init /lbin/mkdevs + s /init /lbin/mkdir + s /init /lbin/chroot + s /init /lbin/kill + s /init /lbin/swapoff + s /init /lbin/free + s /init /lbin/fstype + s /init /lbin/lndir endif @@ -776,13 +635,23 @@ # remove, ehm, things... r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates -x etc/prepare_rescue bin +# historical static device nodes +x devz /devz + +# our own rules file which loads only pnp subsystem mods +x etc/80-drivers.rules /lib/udev/80-drivers.rules.no_modprobe + +# our own udevd start script +x etc/myudevstart /bin + +# mini host file +x etc/host.conf etc -# busybox is mostly broken -## get busybox -#d usr/local/bin -#e cp -a /tmp/bb/{,usr/}{bin,sbin}/* usr/local/bin -#e rm usr/local/bin/init +# log to console 4 +x etc/syslog.conf etc + +# script neeeded for rescue startup +x etc/prepare_rescue bin e ldconfig -r . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.63/data/rescue/rescue.file_list new/installation-images-12.64/data/rescue/rescue.file_list --- old/installation-images-12.63/data/rescue/rescue.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.64/data/rescue/rescue.file_list 2010-09-24 15:08:37.000000000 +0200 @@ -1,4 +1,4 @@ -d bin dev etc home lib mnt proc sys sbin tmp var +d bin dev etc home lib mnt proc sys sbin tmp var root d media/{cdrom,floppy} d lib/modules c 1777 0 0 tmp @@ -6,6 +6,12 @@ # some basic devices e cp -a /dev/* dev +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages without scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fillup: /bin @@ -31,28 +37,6 @@ /etc /sbin -aaa_base: prein,postin -e prein - /etc -r /etc/{csh*,default*,mailcap,mime.types,permissions*} -r /etc/{rc.d.README,runlevel.fallback,zshrc,cron.daily} - /sbin -r /sbin/quick_* - /root -r /etc/init.d/rc?.d/*kerneld -r /etc/init.d/rc?.d/*cron -r /etc/init.d/rc?.d/*pcnfsd -r /etc/init.d/rc?.d/*routed -r /etc/init.d/rc?.d/*nfs -r /etc/init.d/rc?.d/*xdm - /usr/bin -r /usr/bin/ChangeSymlinks - /lib/YaST/SuSEconfig.functions - /var/adm/fillup-templates -e postin -# r /etc/init.d/{README,boot.d/S10serial,cron,kerneld,nfs,pcnfsd,powerfail,routed,serial,skeleton,xdm} -t /etc/fstab - libpcre0: /lib* @@ -175,7 +159,7 @@ gpart: /usr/bin -if arch eq 'sparc' || arch eq 'sparc64' +if exists(silo) silo: /sbin/silo endif @@ -210,27 +194,29 @@ libbz2-1: /lib*/libbz2.so* -if arch eq 'i386' || arch eq 'x86_64' +if exists(lilo) lilo: - /sbin - /usr/sbin + / endif -if arch eq 'ppc' || arch eq 'ppc64' +if exists(pdisk) pdisk: /sbin/pdisk + iprutils: /sbin /usr/sbin + libncurses5: /usr/lib*/libpanel.so.* /usr/lib*/libform.so.* /usr/lib*/libmenu.so.* + eject: /bin endif -if arch eq 's390' || arch eq 's390x' +if exists(s390-tools) s390-tools: /sbin endif @@ -248,9 +234,9 @@ smp_utils: /usr/bin -if arch eq 'i386' || arch eq 'x86_64' +if exists(grub) grub: - /usr/{bin,sbin,lib} + / endif if arch eq 'x86_64' @@ -261,29 +247,14 @@ /lib/libncurses.so.* endif -if arch eq 'ia64' +if exists(efibootmgr) efibootmgr: - /usr/sbin + / libunwind: - /lib/libunwind.so* + /lib*/libunwind.so.* endif -lvm2: postin - /etc - /sbin - /var -e postin - -libsepol1: - / - -device-mapper: postin - /etc - /lib* - /sbin -e postin - libncurses5: /lib*/libncurses.so.* /lib*/libncursesw.so.* @@ -300,12 +271,6 @@ terminfo: /usr/share/terminfo/i/ibm3151 -module-init-tools: postin - /etc - /sbin/{insmod,modprobe,rmmod,depmod,modinfo} - /bin/lsmod -E postin - net-tools: /{,s}bin /usr/sbin @@ -321,15 +286,6 @@ r /etc/{diphosts,ftpusers,hosts.*} e echo Rescue.local >etc/HOSTNAME -if 0 -# conflicts with nfs-utils -nfs-server: postin - /etc/init.d - /usr/sbin/{rpc.*,showmount} - /var/lib/nfs -e postin -endif - icmpinfo: /usr/sbin/icmpinfo @@ -347,7 +303,7 @@ /usr/bin pam: - /{etc,lib*,sbin} + / R s/(pam_unix2.so)\s*$/$1 nullok\n/ /etc/pam.d/common-auth libaudit*: @@ -373,12 +329,6 @@ libusb-1_0-0: /usr/lib* -rpcbind: postin - /etc - /sbin - /var/adm/fillup-templates -e postin - libtirpc1: /etc /lib* @@ -444,10 +394,8 @@ liblua5_1: / -rsync: postin - /etc - /usr/{,s}bin -E postin +libsepol1: + / setserial: /etc @@ -461,7 +409,12 @@ /usr/bin /usr/sbin/pwunconv /usr/sbin/chpasswd + /usr/sbin/groupadd + /usr/sbin/groupadd.local + /usr/sbin/useradd + /usr/sbin/useradd.local /usr/lib*/pwdutils/liblog_syslog.so.* + d /etc/skel login: /{etc,bin} @@ -498,42 +451,18 @@ /sbin/klogd /var/adm/fillup-templates/sysconfig.syslog -syslogd: postin - /etc - /sbin/syslogd -e postin - sysvinit: /sbin -sysvinit-tools: postin -n /dev/initctl -c 600 0 0 /dev/initctl - /sbin -if arch ne 's390' && arch ne 's390x' - /etc -endif -# r /sbin/{powerd,runlevel,setserialbits,start-stop-daemon,sulogin} - /usr/bin - /bin/usleep -e postin - libmount*: / -util-linux: postin - / -e postin - nfs-client: / nfsidmap: /usr/lib*/libnfsidmap.so.* -librpcsecgss: - /usr/lib*/librpcsecgss.so.* - libgssglue*: / @@ -551,6 +480,7 @@ /sbin /usr/sbin endif + mingetty: /sbin @@ -589,24 +519,9 @@ libgthread-2_0-0: / -sysconfig: postin - /etc - /sbin - /var - /var - E postin - -# d /var/run/sysconfig/tmp - libudev0: /lib* -udev: postin - /etc - /lib/udev - /sbin - E postin - sysfsutils: /lib*/libsysfs.so* @@ -625,20 +540,6 @@ dbus-1-glib: / -dbus-1: prein,postin - / - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - E postin - -hal: prein,postin - / - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - E postin - if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ia64' libsmbios2: /usr/lib*/libsmbios.so.* @@ -653,15 +554,11 @@ /usr/sbin endif -dmraid: postin - /lib* - /etc - /sbin -E postin +libparted0: + / parted: - /usr/lib* - /usr/sbin + / libreiserfs: /usr/lib*/libdal-*.so.* @@ -688,14 +585,6 @@ hex: /usr/bin/hex -mdadm: postin - /sbin - /usr/sbin - /etc - /lib - /var/adm/fillup-templates - E postin - if arch ne 's390' && arch ne 's390x' libopensc2: /usr/lib*/libopensc.so.* @@ -712,29 +601,11 @@ libopenct1: /usr/lib*/libopenct.so* -openssh: prein - /etc/ssh - /etc/pam.d/sshd - /etc/init.d/sshd - d /etc/sysconfig - t /etc/sysconfig/ssh - /usr/bin - /usr/sbin - /usr/lib* - /var/lib - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - dhcpcd: - /sbin - /usr/sbin + / dhcpv6: - /usr/sbin - /etc - /var/lib/dhcpv6 - x etc/dhcp6c.conf etc + / libnl: /lib*/libnl.so.* @@ -751,12 +622,6 @@ /lib/udev /sbin -multipath-tools: postin - /etc - /sbin - /lib* -e postin - libaio: /lib*/libaio.so.* @@ -783,15 +648,6 @@ d usr/lib/locale e cp /tmp/usr/lib/locale/locale-archive usr/lib/locale -if arch eq 'ia64' - ia32el: - /etc/init.d/ia32el - /usr/lib/ia32el - r /usr/lib/ia32el/cpuid - r /usr/lib/ia32el/auxapp - e insserv etc/init.d/ia32el -endif - wget: /usr/bin/wget @@ -844,14 +700,113 @@ bootsplash: /sbin/splash +endif + +# to keep postin scripts happy +r /sbin/mkinitrd_setup +s /bin/true /sbin/mkinitrd_setup + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages with scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +aaa_base: prein,postin +E prein + / +t /etc/fstab +E postin + +lvm2: postin + / +E postin + +device-mapper: postin + / +E postin + +module-init-tools: postin + / +E postin + +rpcbind: postin + / +E postin + +rsync: postin + / +E postin + +syslogd: postin + / +E postin + +sysvinit-tools: postin +n /dev/initctl +c 600 0 0 /dev/initctl + / +E postin + +util-linux: postin + / +E postin + +sysconfig: postin + / +E postin + +udev: postin + / +E postin + +dbus-1: prein,postin + / +E prein +E postin + +hal: prein,postin + / +E prein +E postin + +dmraid: postin + / +E postin + +mdadm: postin + / +E postin + +openssh: prein + / + d /etc/sysconfig + t /etc/sysconfig/ssh +E prein +multipath-tools: postin + / +E postin + +if arch eq 'ia64' + ia32el: + /etc/init.d/ia32el + /usr/lib/ia32el + r /usr/lib/ia32el/cpuid + r /usr/lib/ia32el/auxapp + E insserv etc/init.d/ia32el endif + : # remove, ehm, things... r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates +# our own dhcp6c config +x etc/dhcp6c.conf etc + e insserv -f -r etc/init.d/boot.rootfsck r etc/init.d/boot.rootfsck ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2-metatheme-sonar for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package gtk2-metatheme-sonar for openSUSE:Factory checked in at Sun Sep 26 21:34:13 CEST 2010. -------- --- gtk2-metatheme-sonar/gtk2-metatheme-sonar.changes 2010-08-25 21:49:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk2-metatheme-sonar/gtk2-metatheme-sonar.changes 2010-09-26 16:00:28.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 23 23:26:48 UTC 2010 - badshah400(a)gmail.com + +- Add metatheme-Sonar_compatibilty-with-murrine-0.98.patch to + remove options deprecated in murrine 0.98, that create warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- metatheme-Sonar_compatibilty-with-murrine-0.98.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-metatheme-sonar.spec ++++++ --- /var/tmp/diff_new_pack.eM8SlE/_old 2010-09-26 21:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.eM8SlE/_new 2010-09-26 21:33:52.000000000 +0200 @@ -20,13 +20,15 @@ Name: gtk2-metatheme-sonar Version: 11.3.0 -Release: 6 +Release: 7 %define _icon_version 11.3.1 Group: System/GUI/GNOME License: GPLv2+ Summary: GTK+ and Metacity Sonar Theme Source0: metatheme-Sonar-%{version}.tar.bz2 Source1: icon-theme-sonar-%{_icon_version}.tar.bz2 +# PATCH-FIX-OPENSUSE metatheme-Sonar_compatibilty-with-murrine-0.98.patch badshah400(a)gmail.com -- Remove deprecated gradients options, (deprecated with murrine version 0.98). Sent upstream by mail +Patch0: metatheme-Sonar_compatibilty-with-murrine-0.98.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: fdupes @@ -42,7 +44,7 @@ %package -n sonar-icon-theme Version: %{_icon_version} -Release: 2 +Release: 3 License: GPLv2+ Summary: Sonar Icon Theme Group: System/GUI/GNOME @@ -57,6 +59,7 @@ %prep %setup -q -a1 -n Sonar +%patch0 -p1 %build pushd icon-theme-sonar-%{_icon_version} ++++++ metatheme-Sonar_compatibilty-with-murrine-0.98.patch ++++++ diff -ur Sonar.orig//gtk-2.0/gtkrc Sonar//gtk-2.0/gtkrc --- Sonar.orig//gtk-2.0/gtkrc 2009-10-21 00:20:34.000000000 +0530 +++ Sonar//gtk-2.0/gtkrc 2010-09-24 04:51:24.429407368 +0530 @@ -87,7 +87,6 @@ roundness = 2 progressbarstyle = 1 animation = TRUE - gradients = TRUE reliefstyle = 2 sliderstyle = 1 menustyle = 0 @@ -142,7 +141,6 @@ contrast = 0.9 glazestyle = 0 gradient_shades = { 1.05, 1.0, 1.0, 0.9 } - gradients = TRUE highlight_shade = 1.0 lightborder_shade = 1.4 lightborderstyle = 1 @@ -158,11 +156,9 @@ engine "murrine" { colorize_scrollbar = TRUE - gradients = TRUE contrast = 0.3 glazestyle = 0 gradient_shades = { 1.1, 1.0, 1.0, 0.9 } - gradients = TRUE highlight_shade = 1.0 lightborder_shade = 1.2 lightborderstyle = 1 @@ -554,7 +550,6 @@ style "inkscape-toolbar-fix" { engine "murrine" { - gradients = TRUE gradient_shades = {1.00,1.00,1.00,1.00} highlight_shade = 1.00 } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-bad for openSUSE:Factory checked in at Sun Sep 26 21:33:28 CEST 2010. -------- --- GNOME/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2010-09-21 12:24:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2010-09-24 16:40:45.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 24 16:38:56 CEST 2010 - vuntz(a)opensuse.org + +- Move libkate-devel BuildRequires out of the orig build, since + it's now in Factory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.xxts6C/_old 2010-09-26 21:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.xxts6C/_new 2010-09-26 21:32:53.000000000 +0200 @@ -26,7 +26,7 @@ # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. %define _name gst-plugins-bad Version: 0.10.20 -Release: 2 +Release: 3 %define gst_branch 0.10 BuildRequires: DirectFB-devel BuildRequires: SDL-devel @@ -48,6 +48,7 @@ BuildRequires: libgsm-devel BuildRequires: libiptcdata-devel BuildRequires: libjasper-devel +BuildRequires: libkate-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libmusicbrainz-devel @@ -91,7 +92,6 @@ BuildRequires: faac-devel BuildRequires: faad2-devel BuildRequires: libdca-devel -BuildRequires: libkate-devel BuildRequires: libmpeg2-devel BuildRequires: libxvidcore-devel %ifarch %ix86 @@ -340,6 +340,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstjack.so %{_libdir}/gstreamer-%{gst_branch}/libgstjp2k.so %{_libdir}/gstreamer-%{gst_branch}/libgstjpegformat.so +%{_libdir}/gstreamer-%{gst_branch}/libgstkate.so %{_libdir}/gstreamer-%{gst_branch}/libgstladspa.so %{_libdir}/gstreamer-%{gst_branch}/libgstlegacyresample.so %{_libdir}/gstreamer-%{gst_branch}/libgstliveadder.so @@ -408,7 +409,6 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstdvdspu.so %{_libdir}/gstreamer-%{gst_branch}/libgstfaac.so %{_libdir}/gstreamer-%{gst_branch}/libgstfaad.so -%{_libdir}/gstreamer-%{gst_branch}/libgstkate.so %{_libdir}/gstreamer-%{gst_branch}/libgstsiren.so %{_libdir}/gstreamer-%{gst_branch}/libgstxvid.so %if %{with libmms} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-do for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package gnome-do for openSUSE:Factory checked in at Sun Sep 26 21:31:10 CEST 2010. -------- --- GNOME/gnome-do/gnome-do.changes 2009-12-08 14:07:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-do/gnome-do.changes 2010-09-25 15:24:35.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 25 15:18:48 CEST 2010 - vuntz(a)opensuse.org + +- Add gnome-do-no-disable-deprecated.patch to not build with + *_DISABLE_DEPRECATED flags. This fixes the build with GTK+ 2.21.8 + and later. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-do-no-disable-deprecated.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-do.spec ++++++ --- /var/tmp/diff_new_pack.oKsAnL/_old 2010-09-26 21:30:31.000000000 +0200 +++ /var/tmp/diff_new_pack.oKsAnL/_new 2010-09-26 21:30:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-do (Version 0.8.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: gnome-do Version: 0.8.3 -Release: 1 +Release: 6 License: GPLv3+ Url: http://do.davebsd.com/ Source: %{name}-%{version}.tar.bz2 @@ -30,6 +30,8 @@ Patch1: gnome-do-quiet-autostart.patch # PATCH-FIX-UPSTREAM bnc#547744 saarmstong(a)novell.com -- Set correct default theme name in gconf. Patch2: gnome-do-bnc547744.patch +# PATCH-FIX-UPSTREAM gnome-do-no-disable-deprecated.patch lp#647495 vuntz(a)opensuse.org -- Don't build with *_DISABLE_DEPRECATED flags +Patch3: gnome-do-no-disable-deprecated.patch Summary: A powerful, speedy, and sexy remote control for your GNOME Desktop Group: Productivity/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +82,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -fi ++++++ gnome-do-no-disable-deprecated.patch ++++++ Index: gnome-do-0.8.3/libdo/Makefile.am =================================================================== --- gnome-do-0.8.3.orig/libdo/Makefile.am +++ gnome-do-0.8.3/libdo/Makefile.am @@ -2,9 +2,6 @@ INCLUDES = -I$(top_srcdir) AM_CFLAGS = -DG_LOG_DOMAIN=\"libdo\" \ -DEGG_COMPILATION \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ $(LIBDO_CFLAGS) Index: gnome-do-0.8.3/libdo/Makefile.in =================================================================== --- gnome-do-0.8.3.orig/libdo/Makefile.in +++ gnome-do-0.8.3/libdo/Makefile.in @@ -280,9 +280,6 @@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir) AM_CFLAGS = -DG_LOG_DOMAIN=\"libdo\" \ -DEGG_COMPILATION \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ $(LIBDO_CFLAGS) dolibdir = $(pkglibdir) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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