February 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kde4-kaffeine for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package kde4-kaffeine for openSUSE:Factory checked in at Thu Feb 26 17:02:15 CET 2009. -------- --- KDE/kde4-kaffeine/kde4-kaffeine.changes 2009-02-18 11:08:21.000000000 +0100 +++ kde4-kaffeine/kde4-kaffeine.changes 2009-02-25 10:45:04.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 25 10:45:01 CET 2009 - stbinner(a)suse.de + +- update to r931423 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.n23084/_old 2009-02-26 17:01:54.000000000 +0100 +++ /var/tmp/diff_new_pack.n23084/_new 2009-02-26 17:01:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-kaffeine (Version 4.2.0.svn927725) +# spec file for package kde4-kaffeine (Version 4.2.0.svn931423) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 4.2.0.svn927725 -Release: 2 +Version: 4.2.0.svn931423 +Release: 1 # svn.kde.org/home/kde/trunk/extragear/multimedia/kaffeine Source0: kaffeine.tar.bz2 Patch: desktop-files.diff @@ -72,6 +72,8 @@ /usr/share/applications/kde4/kaffeine4.desktop %changelog +* Wed Feb 25 2009 stbinner(a)suse.de +- update to r931423 * Wed Feb 18 2009 stbinner(a)suse.de - update to r927725 * Wed Jan 07 2009 stbinner(a)suse.de ++++++ kaffeine.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/README new/kaffeine/README --- old/kaffeine/README 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/README 2009-02-24 18:46:11.000000000 +0100 @@ -1,3 +1,8 @@ +Requirements +============ + +Phonon 4.3 and KDE 4.2 are strongly recommended. + Naming ====== @@ -11,6 +16,3 @@ You are welcome to report crashes and stuff that doesn't work the right way. We know what stuff isn't implemented yet, so please don't report that (ok, I admit that this distinction sometimes isn't too easy if you don't know the code). - -One known bug is that you can only switch channels once (and kaffeine will crash -at exit); this is being investigated. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/dvb/dvbtab.cpp new/kaffeine/src/dvb/dvbtab.cpp --- old/kaffeine/src/dvb/dvbtab.cpp 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/dvb/dvbtab.cpp 2009-02-20 15:41:24.000000000 +0100 @@ -20,19 +20,17 @@ #include "dvbtab.h" -#include <QHBoxLayout> -#include <QLabel> +#include <QBoxLayout> #include <QSplitter> +#include <Phonon/AbstractMediaStream> #include <KAction> #include <KActionCollection> -#include <KDebug> #include <KLineEdit> #include <KLocalizedString> #include <KMenu> #include <KMessageBox> #include "../mediawidget.h" #include "../proxytreeview.h" -#include "dvbchannel.h" #include "dvbchannelview.h" #include "dvbconfigdialog.h" #include "dvbdevice.h" @@ -40,13 +38,11 @@ #include "dvbrecording.h" #include "dvbscandialog.h" -// FIXME - DvbStream is just a demo hack - -class DvbStream : public DvbLiveFeed, public DvbPidFilter +class DvbStream : public Phonon::AbstractMediaStream, public DvbPidFilter { public: - DvbStream(DvbManager *dvbManager_, DvbDevice *device_, DvbSharedChannel channel_) : - dvbManager(dvbManager_), device(device_), channel(channel_), bufferPos(0) + DvbStream(DvbDevice *device_, const DvbSharedChannel &channel_) : device(device_), + channel(channel_), bufferPos(0) { setStreamSize(-1); buffer.resize(188 * 64); @@ -54,21 +50,6 @@ ~DvbStream() { } - void livePaused(bool /*paused*/) - { - // FIXME timeshift & co - } - - void liveStopped() - { - if (device != NULL) { - device->stopDevice(); - dvbManager->releaseDevice(device); - device = NULL; - } - } - - DvbManager *dvbManager; DvbDevice *device; DvbSharedChannel channel; @@ -221,37 +202,29 @@ void DvbTab::liveStopped() { + DvbDevice *device = liveStream->device; + device->stopDevice(); + dvbManager->releaseDevice(device); liveStream = NULL; } void DvbTab::playChannel(const DvbSharedChannel &channel) { - if (liveStream != NULL) { - liveStream->liveStopped(); - // FIXME hacky; but ok for now - disconnect(liveStream, SIGNAL(destroyed(QObject *)), this, SLOT(liveStopped())); - liveStream = NULL; - } - - // don't call mediaWidget->stop() here - // otherwise the media widget runs into trouble - // because the stop event arrives after starting playback ... + delete liveStream; // liveStream is set to NULL by liveStopped() if (channel == NULL) { - mediaWidget->stop(); return; } DvbDevice *device = dvbManager->requestDevice(channel->source); if (device == NULL) { - mediaWidget->stop(); KMessageBox::sorry(this, i18n("No suitable device found.")); return; } - liveStream = new DvbStream(dvbManager, device, channel); - connect(liveStream, SIGNAL(destroyed(QObject *)), this, SLOT(liveStopped())); + liveStream = new DvbStream(device, channel); + connect(liveStream, SIGNAL(destroyed(QObject*)), this, SLOT(liveStopped())); device->tuneDevice(channel->transponder); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/dvb/dvbtab.h new/kaffeine/src/dvb/dvbtab.h --- old/kaffeine/src/dvb/dvbtab.h 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/dvb/dvbtab.h 2009-02-20 15:41:24.000000000 +0100 @@ -51,7 +51,6 @@ void showChannelDialog(); void showRecordingDialog(); void configureDvb(); - void playLive(const QModelIndex &index); void liveStopped(); @@ -66,7 +65,6 @@ ProxyTreeView *channelView; - // FIXME - just a demo hack DvbStream *liveStream; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/kaffeine.cpp new/kaffeine/src/kaffeine.cpp --- old/kaffeine/src/kaffeine.cpp 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/kaffeine.cpp 2009-02-24 18:46:11.000000000 +0100 @@ -23,7 +23,6 @@ #include <QLabel> #include <QPushButton> #include <QStackedLayout> -#include <QTimer> #include <KActionCollection> #include <KCmdLineOptions> #include <KFileDialog> @@ -129,9 +128,6 @@ Kaffeine::Kaffeine() { - // unlike qt, kde sets this flag - setAttribute(Qt::WA_DeleteOnClose, false); - // menu structure KMenuBar *menuBar = KMainWindow::menuBar(); @@ -215,7 +211,7 @@ stackedLayout = new QStackedLayout(widget); setCentralWidget(widget); - mediaWidget = new MediaWidget(widget, toolBar, collection); + mediaWidget = new MediaWidget(toolBar, collection, widget); connect(mediaWidget, SIGNAL(toggleFullscreen()), this, SLOT(toggleFullscreen())); // tabs @@ -248,11 +244,6 @@ // workaround setAutoSaveSettings() which doesn't accept "IconOnly" as initial state toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); - // workaround broken size restoring - if (KConfig().group("Workarounds").readEntry("Maximized", false)) { - QTimer::singleShot(0, this, SLOT(showMaximized())); - } - parseArgs(); show(); @@ -260,9 +251,6 @@ Kaffeine::~Kaffeine() { - // workaround broken size restoring - KConfig().group("Workarounds").writeEntry("Maximized", isMaximized()); - actionOpenRecent->saveEntries(KConfigGroup(KGlobal::config(), "Recent Files")); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/main.cpp new/kaffeine/src/main.cpp --- old/kaffeine/src/main.cpp 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/main.cpp 2009-02-24 18:46:11.000000000 +0100 @@ -28,13 +28,20 @@ class KaffeineApplication : public KUniqueApplication { public: - KaffeineApplication() { } - ~KaffeineApplication() { } + KaffeineApplication() + { + kaffeine = new Kaffeine(); + } + + ~KaffeineApplication() + { + // unlike qt, kde sets Qt::WA_DeleteOnClose and needs it to work properly ... + } private: int newInstance(); - Kaffeine kaffeine; + Kaffeine *kaffeine; }; int KaffeineApplication::newInstance() @@ -42,7 +49,7 @@ // for window activation - FIXME do some checks about behaviour KUniqueApplication::newInstance(); - kaffeine.parseArgs(); + kaffeine->parseArgs(); return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/mediawidget.cpp new/kaffeine/src/mediawidget.cpp --- old/kaffeine/src/mediawidget.cpp 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/mediawidget.cpp 2009-02-21 13:24:30.000000000 +0100 @@ -1,7 +1,7 @@ /* * mediawidget.cpp * - * Copyright (C) 2007-2008 Christoph Pfister <christophpfister(a)gmail.com> + * Copyright (C) 2007-2009 Christoph Pfister <christophpfister(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,21 +23,22 @@ #include <QBoxLayout> #include <Phonon/AbstractMediaStream> #include <Phonon/AudioOutput> +#include <Phonon/MediaController> #include <Phonon/MediaObject> -#include <Phonon/Path> #include <Phonon/SeekSlider> #include <Phonon/VideoWidget> #include <Phonon/VolumeSlider> #include <KAction> #include <KActionCollection> +#include <KComboBox> #include <KLocalizedString> #include <KMessageBox> #include <KToolBar> #include <KUrl> -#include "kaffeine.h" -MediaWidget::MediaWidget(QWidget *parent, KToolBar *toolBar, KActionCollection *collection) : - QWidget(parent), liveFeed(NULL), playing(true) +MediaWidget::MediaWidget(KToolBar *toolBar, KActionCollection *collection, QWidget *parent) : + QWidget(parent), playing(true), titleCount(0), chapterCount(0), audioChannelsReady(false), + subtitlesReady(false) { QBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); @@ -53,30 +54,52 @@ Phonon::createPath(mediaObject, videoWidget); layout->addWidget(videoWidget); - actionBackward = new KAction(KIcon("media-skip-backward"), i18n("Previous"), collection); - toolBar->addAction(collection->addAction("controls_previous", actionBackward)); + mediaController = new Phonon::MediaController(mediaObject); + connect(mediaController, SIGNAL(availableTitlesChanged(int)), + this, SLOT(titleCountChanged(int))); + connect(mediaController, SIGNAL(availableChaptersChanged(int)), + this, SLOT(chapterCountChanged(int))); + connect(mediaController, SIGNAL(availableAudioChannelsChanged()), + this, SLOT(audioChannelsChanged())); + connect(mediaController, SIGNAL(availableSubtitlesChanged()), + this, SLOT(subtitlesChanged())); + + actionPrevious = new KAction(KIcon("media-skip-backward"), i18n("Previous"), collection); + connect(actionPrevious, SIGNAL(triggered(bool)), this, SLOT(previous())); + toolBar->addAction(collection->addAction("controls_previous", actionPrevious)); actionPlayPause = new KAction(collection); - connect(actionPlayPause, SIGNAL(triggered(bool)), this, SLOT(playPause(bool))); actionPlayPause->setShortcut(Qt::Key_Space); textPlay = i18n("Play"); textPause = i18n("Pause"); iconPlay = KIcon("media-playback-start"); iconPause = KIcon("media-playback-pause"); + connect(actionPlayPause, SIGNAL(triggered(bool)), this, SLOT(playPause(bool))); toolBar->addAction(collection->addAction("controls_play_pause", actionPlayPause)); actionStop = new KAction(KIcon("media-playback-stop"), i18n("Stop"), collection); connect(actionStop, SIGNAL(triggered(bool)), this, SLOT(stop())); toolBar->addAction(collection->addAction("controls_stop", actionStop)); - actionForward = new KAction(KIcon("media-skip-forward"), i18n("Next"), collection); - toolBar->addAction(collection->addAction("controls_next", actionForward)); + actionNext = new KAction(KIcon("media-skip-forward"), i18n("Next"), collection); + connect(actionNext, SIGNAL(triggered(bool)), this, SLOT(next())); + toolBar->addAction(collection->addAction("controls_next", actionNext)); + + audioChannelBox = new KComboBox(toolBar); + connect(audioChannelBox, SIGNAL(currentIndexChanged(int)), + this, SLOT(changeAudioChannel(int))); + toolBar->addWidget(audioChannelBox); + + subtitleBox = new KComboBox(toolBar); + textSubtitlesOff = i18n("off"); + connect(subtitleBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSubtitle(int))); + toolBar->addWidget(subtitleBox); - Phonon::VolumeSlider *volumeSlider = new Phonon::VolumeSlider(); + Phonon::VolumeSlider *volumeSlider = new Phonon::VolumeSlider(toolBar); volumeSlider->setAudioOutput(audioOutput); toolBar->addWidget(volumeSlider); - Phonon::SeekSlider *seekSlider = new Phonon::SeekSlider(); + Phonon::SeekSlider *seekSlider = new Phonon::SeekSlider(toolBar); seekSlider->setMediaObject(mediaObject); QSizePolicy sizePolicy = seekSlider->sizePolicy(); sizePolicy.setHorizontalStretch(1); @@ -86,9 +109,8 @@ stateChanged(Phonon::StoppedState); } -bool MediaWidget::isPlaying() const +MediaWidget::~MediaWidget() { - return playing; } void MediaWidget::play(const KUrl &url) @@ -115,24 +137,15 @@ mediaObject->play(); } -void MediaWidget::playDvb(DvbLiveFeed *feed) +void MediaWidget::playDvb(Phonon::AbstractMediaStream *feed) { - if (liveFeed != NULL) { - liveFeed->liveStopped(); - delete liveFeed; - liveFeed = NULL; - } - - liveFeed = feed; - mediaObject->setCurrentSource(Phonon::MediaSource(feed)); + dvbFeed = feed; + Phonon::MediaSource source(feed); + source.setAutoDelete(true); + mediaObject->setCurrentSource(source); mediaObject->play(); } -void MediaWidget::stop() -{ - mediaObject->stop(); -} - void MediaWidget::stateChanged(Phonon::State state) { bool newPlaying = false; @@ -154,17 +167,18 @@ break; } - if (liveFeed && !newPlaying) { - liveFeed->liveStopped(); - delete liveFeed; - liveFeed = NULL; - } - if (playing == newPlaying) { return; } - if (newPlaying) { + playing = newPlaying; + + if (!playing) { + // FIXME is there a more elegant way to do this? + delete dvbFeed; // dvbFeed is a QPointer + } + + if (playing) { actionPlayPause->setText(textPause); actionPlayPause->setIcon(iconPause); actionPlayPause->setCheckable(true); @@ -176,16 +190,19 @@ actionStop->setEnabled(false); } - // FIXME take care of skip forward / backward - actionBackward->setEnabled(false); - actionForward->setEnabled(false); + updatePreviousNext(); + updateAudioChannelBox(); + updateSubtitleBox(); +} - playing = newPlaying; +void MediaWidget::previous() +{ + mediaController->previousTitle(); } void MediaWidget::playPause(bool paused) { - if (isPlaying()) { + if (playing) { if (paused) { mediaObject->pause(); } else { @@ -196,7 +213,113 @@ } } +void MediaWidget::stop() +{ + mediaObject->stop(); +} + +void MediaWidget::next() +{ + mediaController->nextTitle(); +} + +void MediaWidget::changeAudioChannel(int index) +{ + if (audioChannelsReady) { + mediaController->setCurrentAudioChannel(audioChannels.at(index)); + } +} + +void MediaWidget::changeSubtitle(int index) +{ + if (subtitlesReady) { + mediaController->setCurrentSubtitle(subtitles.at(index)); + } +} + +void MediaWidget::titleCountChanged(int count) +{ + titleCount = count; + updatePreviousNext(); +} + +void MediaWidget::chapterCountChanged(int count) +{ + chapterCount = count; + updatePreviousNext(); +} + +void MediaWidget::audioChannelsChanged() +{ + audioChannels = mediaController->availableAudioChannels(); + updateAudioChannelBox(); +} + +void MediaWidget::subtitlesChanged() +{ + subtitles = mediaController->availableSubtitles(); + subtitles.prepend(Phonon::SubtitleDescription()); // helper for switching subtitles off + updateSubtitleBox(); +} + void MediaWidget::mouseDoubleClickEvent(QMouseEvent *) { emit toggleFullscreen(); } + +void MediaWidget::updatePreviousNext() +{ + bool enabled = playing && ((titleCount > 1) || (chapterCount > 1)); + actionPrevious->setEnabled(enabled); + actionNext->setEnabled(enabled); +} + +void MediaWidget::updateAudioChannelBox() +{ + audioChannelsReady = false; + audioChannelBox->clear(); + audioChannelBox->setEnabled(playing && (audioChannels.size() > 1)); + + if (playing) { + Phonon::AudioChannelDescription current = mediaController->currentAudioChannel(); + int index = -1; + + for (int i = 0; i < audioChannels.size(); ++i) { + const Phonon::AudioChannelDescription &description = audioChannels.at(i); + audioChannelBox->addItem(description.name()); + + if (description == current) { + index = i; + } + } + + audioChannelBox->setCurrentIndex(index); + audioChannelsReady = true; + } +} + +void MediaWidget::updateSubtitleBox() +{ + subtitlesReady = false; + subtitleBox->clear(); + subtitleBox->setEnabled(playing && (subtitles.size() > 1)); + + if (playing) { + Phonon::SubtitleDescription current = mediaController->currentSubtitle(); + int index = 0; + + subtitleBox->addItem(textSubtitlesOff); + + for (int i = 1; i < subtitles.size(); ++i) { + const Phonon::SubtitleDescription &description = subtitles.at(i); + subtitleBox->addItem(description.name()); + + if (description == current) { + index = i; + } + } + + subtitleBox->setCurrentIndex(index); + subtitlesReady = true; + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/src/mediawidget.h new/kaffeine/src/mediawidget.h --- old/kaffeine/src/mediawidget.h 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/src/mediawidget.h 2009-02-21 13:24:30.000000000 +0100 @@ -1,7 +1,7 @@ /* * mediawidget.h * - * Copyright (C) 2007-2008 Christoph Pfister <christophpfister(a)gmail.com> + * Copyright (C) 2007-2009 Christoph Pfister <christophpfister(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,24 +21,30 @@ #ifndef MEDIAWIDGET_H #define MEDIAWIDGET_H +#include <QPointer> #include <QWidget> -#include <Phonon/AbstractMediaStream> +#include <Phonon/Global> +#include <Phonon/ObjectDescription> #include <KIcon> +namespace Phonon +{ +class AbstractMediaStream; +class MediaController; +class MediaObject; +} class KAction; class KActionCollection; +class KComboBox; class KToolBar; class KUrl; -class DvbLiveFeed; class MediaWidget : public QWidget { Q_OBJECT public: - MediaWidget(QWidget *parent, KToolBar *toolBar, KActionCollection *collection); - ~MediaWidget() { } - - bool isPlaying() const; + MediaWidget(KToolBar *toolBar, KActionCollection *collection, QWidget *parent); + ~MediaWidget(); /* * loads the media and starts playback @@ -50,47 +56,58 @@ void playDvd(); /* - * ownership is taken over by the media widget + * you stop dvb playback by deleting the feed + * the feed is deleted by MediaWidget if the user stops playback */ - void playDvb(DvbLiveFeed *feed); + void playDvb(Phonon::AbstractMediaStream *feed); signals: void toggleFullscreen(); -public slots: - void stop(); - private slots: void stateChanged(Phonon::State state); + void previous(); void playPause(bool paused); + void stop(); + void next(); + void changeAudioChannel(int index); + void changeSubtitle(int index); + + void titleCountChanged(int count); + void chapterCountChanged(int count); + void audioChannelsChanged(); + void subtitlesChanged(); private: void mouseDoubleClickEvent(QMouseEvent *); + void updatePreviousNext(); + void updateAudioChannelBox(); + void updateSubtitleBox(); Phonon::MediaObject *mediaObject; - DvbLiveFeed *liveFeed; + Phonon::MediaController *mediaController; + QPointer<Phonon::AbstractMediaStream> dvbFeed; bool playing; - KAction *actionBackward; + KAction *actionPrevious; KAction *actionPlayPause; - KAction *actionStop; - KAction *actionForward; - QString textPlay; QString textPause; KIcon iconPlay; KIcon iconPause; -}; - -class DvbLiveFeed : public Phonon::AbstractMediaStream -{ -public: - DvbLiveFeed() { } - virtual ~DvbLiveFeed() { } - - virtual void livePaused(bool paused) = 0; - virtual void liveStopped() = 0; + KAction *actionStop; + KAction *actionNext; + KComboBox *audioChannelBox; + KComboBox *subtitleBox; + QString textSubtitlesOff; + + int titleCount; + int chapterCount; + bool audioChannelsReady; + bool subtitlesReady; + QList<Phonon::AudioChannelDescription> audioChannels; + QList<Phonon::SubtitleDescription> subtitles; }; #endif /* MEDIAWIDGET_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kaffeine/TODO new/kaffeine/TODO --- old/kaffeine/TODO 2009-02-18 11:07:59.000000000 +0100 +++ new/kaffeine/TODO 2009-02-21 13:24:30.000000000 +0100 @@ -8,9 +8,6 @@ == Functionality required before first beta release == -= General = -General Selection of Audio channel and subtitles - = DVB Subsystem = Synthesize PAT/PMT DVB Selection of Audio Channels/Subtitles @@ -22,16 +19,14 @@ Profile the playback subsystem performance == Future functionality == -CD Ripping +CD: track selection, CDDB (or similar), ripping +DVD: menu / title / chapter / angle selection +CD / VCD / DVD: deal nicely with multiple drives Playlist support CICAM support -Recordings (ability to record a show and watch it later) Documentation / Manual (too early for that) * section about updating scan file -== Random stuff == -Deal nicely with multiple dvd/... drives - I know I should add a contribution section here; if you're interested drop a line to kaffeine-user (at) lists.sourceforge.net which is regularly moderated, so you don't ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kde4-k3b for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package kde4-k3b for openSUSE:Factory checked in at Thu Feb 26 17:01:41 CET 2009. -------- --- KDE/kde4-k3b/kde4-k3b.changes 2009-02-18 11:56:16.000000000 +0100 +++ kde4-k3b/kde4-k3b.changes 2009-02-25 10:41:56.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 25 09:50:28 CET 2009 - stbinner(a)suse.de + +- update to 4.2.0.svn931376 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-k3b.spec ++++++ --- /var/tmp/diff_new_pack.P22267/_old 2009-02-26 17:01:16.000000000 +0100 +++ /var/tmp/diff_new_pack.P22267/_new 2009-02-26 17:01:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-k3b (Version 4.2.0.svn927728) +# spec file for package kde4-k3b (Version 4.2.0.svn931376) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,7 +32,7 @@ Group: Productivity/Multimedia/CD/Record Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools -Version: 4.2.0.svn927728 +Version: 4.2.0.svn931376 Release: 1 # svn.kde.org/home/kde/trunk/extragear/multimedia/k3b Source0: k3b.tar.bz2 @@ -119,6 +119,8 @@ /usr/%_lib/libk3bdevice.so %changelog +* Wed Feb 25 2009 stbinner(a)suse.de +- update to 4.2.0.svn931376 * Wed Feb 18 2009 stbinner(a)suse.de - update to 4.2.0.svn927728 * Fri Jan 23 2009 stbinner(a)suse.de ++++++ k3b.tar.bz2 ++++++ ++++ 120219 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 gwget for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package gwget for openSUSE:Factory checked in at Thu Feb 26 16:58:43 CET 2009. -------- --- GNOME/gwget/gwget.changes 2009-02-19 16:16:26.000000000 +0100 +++ gwget/gwget.changes 2009-02-23 10:47:34.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 23 10:39:55 CET 2009 - mseben(a)suse.cz + +- add epiphany-2.25.patch to fix epiphany 2.25.91 detection + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gwget-epiphany-2.25.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwget.spec ++++++ --- /var/tmp/diff_new_pack.g16396/_old 2009-02-26 16:58:15.000000000 +0100 +++ /var/tmp/diff_new_pack.g16396/_new 2009-02-26 16:58:15.000000000 +0100 @@ -24,14 +24,17 @@ Group: Productivity/Networking/Web/Utilities Requires: wget Version: 1.0.1 -Release: 1 +Release: 2 Summary: Front-End for wget Written in GTK+ Url: http://gnome.org/projects/gwget/ PreReq: filesystem gconf2 Source: %{name}-%{version}.tar.bz2 +#PATCH-FIX-OPENSUSE string_h.patch fix unhandled strlen function Patch1: %{name}-string_h.patch Patch2: %{name}-icon_suffix.patch Patch3: %{name}-libgnomeui-2.0.patch +#PATCH-FIX-OPENSUSE epiphany-2.25.patch fix epiphany 2.25.91 detection +Patch4: %{name}-epiphany-2.25.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: %{name}-lang = %{version} @@ -54,12 +57,13 @@ %patch1 %patch2 %patch3 +%patch4 %build autoreconf -f -i # FIXME: Must not build as root: # --disable-schemas-install is not implemented in gwget-0.98.2 -%configure +%configure --enable-epiphany-extension make %{?jobs:-j%jobs} %install @@ -90,12 +94,14 @@ %{_datadir}/applications/*.desktop %{_datadir}/gwget %{_datadir}/pixmaps/%{name}*.* +%{_datadir}/dbus-1/services/org.gnome.gwget.service %{_libdir}/epiphany/*/*/*.* -/usr/share/dbus-1/services/org.gnome.gwget.service %files lang -f %{name}.lang %changelog +* Mon Feb 23 2009 mseben(a)suse.cz +- add epiphany-2.25.patch to fix epiphany 2.25.91 detection * Thu Feb 19 2009 mseben(a)suse.cz - updated to 1.0.1 version * Fix Epiphany Extension. ++++++ gwget-epiphany-2.25.patch ++++++ --- configure.ac +++ configure.ac @@ -215,10 +216,10 @@ EPIPHANY_PKGCONFIG=epiphany-2.25 EPIPHANY_REQUIRED=2.25 EPIPHANY_SHORTVER=225 -elif test "x$EPHY_VER" = "x2.18"; then +elif test "x$EPHY_VER" = "x2.26"; then EPIPHANY_PKGCONFIG=epiphany-2.26 - EPIPHANY_REQUIRED=2.26 - EPIPHANY_SHORTVER=226 + EPIPHANY_REQUIRED=2.25 + EPIPHANY_SHORTVER=225 else AC_MSG_RESULT([no epiphany installed]) fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 glew for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package glew for openSUSE:Factory checked in at Thu Feb 26 16:55:04 CET 2009. -------- --- glew/glew.changes 2008-03-20 19:22:07.000000000 +0100 +++ glew/glew.changes 2009-02-25 00:52:18.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 25 00:51:46 CET 2009 - crrodriguez(a)suse.de + +- static libraries are not usable and now removed. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glew.spec ++++++ --- /var/tmp/diff_new_pack.e11155/_old 2009-02-26 16:54:52.000000000 +0100 +++ /var/tmp/diff_new_pack.e11155/_new 2009-02-26 16:54:52.000000000 +0100 @@ -1,10 +1,17 @@ # # spec file for package glew (Version 1.5.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Group: System/Libraries Summary: OpenGL Extension Wrangler Library Version: 1.5.0 -Release: 17 +Release: 66 Source: %{name}-%{version}-src.tar.bz2 Requires: libGLEW1_5 >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +45,7 @@ Marcelo Magallon %package -n libGLEW1_5 +License: BSD 3-Clause; GPL v2 only; Other uncritical OpenSource License Group: System/Libraries Summary: OpenGL Extension Wrangler Library @@ -56,6 +64,7 @@ Marcelo Magallon %package devel +License: BSD 3-Clause; GPL v2 only; Other uncritical OpenSource License Group: System/Libraries Summary: OpenGL Extension Wrangler Library Requires: %{name} = %{version} Mesa-devel @@ -75,7 +84,7 @@ Marcelo Magallon %prep -%setup -n %{name} +%setup -q -n %{name} chmod -x doc/glew.txt %build @@ -86,6 +95,7 @@ export PATH=$PWD:$PATH make GLEW_DEST=$RPM_BUILD_ROOT%{_prefix} LIBDIR=$RPM_BUILD_ROOT%{_libdir} LDFLAGS.EXTRA= STRIP=/bin/true install chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* +%{__rm} -f %{buildroot}%{_libdir}/*.*a %clean rm -rf $RPM_BUILD_ROOT @@ -106,10 +116,11 @@ %files devel %defattr(-,root,root) %{_includedir}/GL/*.h -%{_libdir}/*.*a %{_libdir}/*.so %changelog +* Wed Feb 25 2009 crrodriguez(a)suse.de +- static libraries are not usable and now removed. * Thu Mar 20 2008 sbrabec(a)suse.cz - Removed bad dependencies from libGLEW1_5 (bnc#372722). * Mon Jan 14 2008 sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fop for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package fop for openSUSE:Factory checked in at Thu Feb 26 16:54:45 CET 2009. -------- --- fop/fop.changes 2008-08-06 15:25:40.000000000 +0200 +++ fop/fop.changes 2009-02-26 13:53:15.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 26 13:52:34 CET 2009 - mvyskocil(a)suse.cz + +- fixed bnc#467866 - fop fails if JAVACMD_OPTS is set + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fop-0.95-java_opts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fop.spec ++++++ --- /var/tmp/diff_new_pack.QK1660/_old 2009-02-26 16:48:03.000000000 +0100 +++ /var/tmp/diff_new_pack.QK1660/_new 2009-02-26 16:48:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fop (Version 0.95) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -24,10 +24,12 @@ Summary: Formatter for Printing XSLT Processed XML Files Requires: jre Version: 0.95 -Release: 1 +Release: 25 Url: http://xml.apache.org/fop/ Source0: http://apache.easy-webs.de/xml/fop/fop-%{version}-src.tar.gz Source1: fop-sh +# PATCH-FIX-UPSTREAM fop-0.95-java_opts.patch bnc#467866, bao#46771 +Patch0: fop-0.95-java_opts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant-junit ant-trax java-1_4_2-gcj-compat-devel unzip xml-commons-apis xml-commons-resolver @@ -45,6 +47,7 @@ %prep %setup -q cat %{S:1} | sed s=@FOP_HOME@=%{_datadir}/%{name}= > fop.sh +%patch0 -b .java_opts %build export JAVA_HOME=/usr/lib/jvm/java @@ -85,6 +88,8 @@ %{_datadir}/%{name}-%{version}/ %changelog +* Thu Feb 26 2009 mvyskocil(a)suse.cz +- fixed bnc#467866 - fop fails if JAVACMD_OPTS is set * Wed Aug 06 2008 skh(a)suse.de - update to version 0.95, list of changes at: http://xmlgraphics.apache.org/fop/0.95/changes_0.95.html @@ -103,7 +108,7 @@ * Tue Jul 10 2007 skh(a)suse.de - update to version 0.93 - build with gcj -* Mon May 07 2007 ro(a)suse.de +* Sun May 06 2007 ro(a)suse.de - added unzip to buildrequires * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires ++++++ fop-0.95-java_opts.patch ++++++ --- fop +++ fop @@ -137,7 +137,8 @@ fi fi -if [ ! -x "$JAVACMD" ] ; then +# bnc#467866 fop fails if JAVACMD_OPTS is set +if [ ! -x "`echo $JAVACMD | cut -d ' ' -f 1`" ] ; then echo "Error: JAVA_HOME is not defined correctly." echo " We cannot execute $JAVACMD" exit 1 @@ -247,7 +248,7 @@ # Execute FOP using eval/exec to preserve spaces in paths, # java options, and FOP args -fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args" +fop_exec_command="exec $JAVACMD $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args" if $fop_exec_debug ; then echo $fop_exec_command fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 enscript for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package enscript for openSUSE:Factory checked in at Thu Feb 26 16:45:32 CET 2009. -------- --- enscript/enscript.changes 2009-02-16 01:11:57.000000000 +0100 +++ enscript/enscript.changes 2009-02-26 16:09:19.884001865 +0100 @@ -1,0 +2,6 @@ +Thu Feb 26 16:08:12 CET 2009 - werner(a)suse.de + +- Do not add empty strings to long options without argument e.g. + --color (bnc#478464) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enscript.spec ++++++ --- /var/tmp/diff_new_pack.Q26203/_old 2009-02-26 16:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Q26203/_new 2009-02-26 16:43:37.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %install_info_prereq AutoReqProv: on Version: 1.6.4 -Release: 153 +Release: 154 Summary: An ASCII to PostScript(tm) Converter Source: enscript-%{version}.tar.bz2 Source1: enscript-gs-font.map @@ -123,6 +123,9 @@ %doc %{_infodir}/%{name}.info.gz %changelog +* Thu Feb 26 2009 werner(a)suse.de +- Do not add empty strings to long options without argument e.g. + --color (bnc#478464) * Mon Feb 16 2009 ro(a)suse.de - drop buildreq for lprng * Wed Oct 29 2008 werner(a)suse.de ++++++ enscript.sh ++++++ --- /var/tmp/diff_new_pack.Q26203/_old 2009-02-26 16:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Q26203/_new 2009-02-26 16:43:37.000000000 +0100 @@ -43,7 +43,7 @@ # We need the file names provided on the command line # or the information if we read from stdin. # -CMDLINE=$(getopt -o $SHORT -l $LONG -s bash -q -- "$@") +CMDLINE=$(getopt -u -o $SHORT -l $LONG -s bash -q -- "$@") if test $? -ne 0 ; then # Let enscript do the error message exec -a enscript enscript.bin ${1+"$@"} @@ -54,15 +54,17 @@ # which are inserted by getopt(1) and also the empty space on the # short options -C, -e, -E, -H, and -u. # -CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed "s|--$[a-z-]\+$ \?$[^-]$|--\1=\2|g") -CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed "s|-$[CeEHu]$ \?$[^-]$|-\1\2|g") +CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's|--([a-z-]+) ?([^-])|--\1=\2|g') +CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's|-([CeEHu]) ?([^-])|-\1\2|g') +CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's|=([[:space:]]+)|\1|g') # # Just for encoding given on command line: # allow the user to overwrite autodetection # case "${CMDLINE}" in - *-X\ \'UTF-8\'*|*--encoding=\'UTF-8\'*) + *-X[[:blank:]]UTF-8*|*--encoding=UTF-8*) + CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's@(-X[[:blank:]]+|--encoding=)UTF-8@@g') ;; # handle this below *-X*|*--encoding=*|*--version*|*--help*|*-V*|*--list-media*) exec -a enscript enscript.bin ${1+"$@"} @@ -75,12 +77,11 @@ # # To not fool the bash with eval here # - FILES=$(echo "$CMDLINE" | LC_ALL=POSIX sed "s|.* -- \?$.*$|\1|") -CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed "s|$.*$ -- \?.*|\1|") + FILES=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's|.* -- ?(.*)|\1|g') +CMDLINE=$(echo "$CMDLINE" | LC_ALL=POSIX sed -r 's|(.*) -- ?.*|\1|g') -if test "$FILES" = "'-'" ; then +if test "$FILES" = "-" ; then FILES="" - eval set -- "$CMDLINE" fi if test -n "$FILES" ; then @@ -88,7 +89,9 @@ # We have real files, maybe with spaces in their path name # eval set -- "$CMDLINE" "$FILES" - exec enscript.bin -X $ENC --filter="[[ \$(file -b %s 2>/dev/null) =~ 'UTF-8 Unicode text' ]] && iconv -c -f UTF-8 -t $ENC %s || cat %s" ${1+"$@"} + exec -a enscript enscript.bin -X $ENC --filter="[[ \$(file -b %s 2>/dev/null) =~ 'UTF-8 Unicode text' ]] && iconv -c -f UTF-8 -t $ENC %s || cat %s" ${1+"$@"} +else + eval set -- "$CMDLINE" fi # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cryptsetup for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at Thu Feb 26 16:43:29 CET 2009. -------- --- cryptsetup/cryptsetup.changes 2009-02-25 13:58:24.000000000 +0100 +++ cryptsetup/cryptsetup.changes 2009-02-26 15:35:40.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 26 15:34:06 CET 2009 - mhopf(a)suse.de + +- Fix segfault with oversized hashes (bnc #476290). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug-476290_hashalot-hashlen.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.a22655/_old 2009-02-26 16:41:27.000000000 +0100 +++ /var/tmp/diff_new_pack.a22655/_new 2009-02-26 16:41:27.000000000 +0100 @@ -30,7 +30,7 @@ Group: System/Base AutoReqProv: on Version: 1.0.5_SVNr46 -Release: 59 +Release: 60 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -46,6 +46,7 @@ Patch12: hashalot-ctrl-d.diff Patch13: hashalot-timeout.diff Patch14: hashalot-manpage.diff +Patch15: bug-476290_hashalot-hashlen.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: aaa_base:/etc/init.d/boot.crypto Obsoletes: util-linux-crypto <= 2.12r @@ -122,6 +123,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 popd %build @@ -225,6 +227,8 @@ %{_libdir}/libcryptsetup.so %changelog +* Thu Feb 26 2009 mhopf(a)suse.de +- Fix segfault with oversized hashes (bnc #476290). * Wed Feb 25 2009 jsmeix(a)suse.de - Fixed initrd LUKS password annoyance in mkinitrd-boot.sh and mkinitrd-setup.sh when the same password is used for all ++++++ bug-476290_hashalot-hashlen.diff ++++++ diff -up hashalot-0.3/hashalot.c.orig hashalot-0.3/hashalot.c --- hashalot-0.3/hashalot.c.orig 2009-02-11 19:31:16.000000000 -0600 +++ hashalot-0.3/hashalot.c 2009-02-11 19:47:46.000000000 -0600 @@ -34,6 +34,7 @@ #include "sha512.h" #define PASSWDBUFFLEN 130 +#define MAXHASHLEN (ULONG_MAX/2 - 2) typedef int (*phash_func_t)(char dest[], size_t dest_len, const char src[], size_t src_len); @@ -179,8 +180,7 @@ static void * xmalloc (size_t size) { void *p; - if (size == 0) - return NULL; + assert(size != 0); p = malloc(size); if (p == NULL) { @@ -239,6 +239,12 @@ main(int argc, char *argv[]) show_usage(argv[0]); exit(EXIT_FAILURE); } + if (hashlen >= MAXHASHLEN) { + fprintf(stderr, + "please supply a value smaller than %lu for the -n option\n", + MAXHASHLEN); + exit(EXIT_FAILURE); + } break; case 's': salt = optarg; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 compiz-manager for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Thu Feb 26 16:41:15 CET 2009. -------- --- compiz-manager/compiz-manager.changes 2009-01-27 17:21:23.000000000 +0100 +++ compiz-manager/compiz-manager.changes 2009-02-24 16:23:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 24 10:10:18 EST 2009 - davidr(a)novell.com + +- Disable use of --loose-binding option (bnc#469785) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug-469785-disable-loose-binding.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.tw7247/_old 2009-02-26 16:36:34.000000000 +0100 +++ /var/tmp/diff_new_pack.tw7247/_new 2009-02-26 16:36:34.000000000 +0100 @@ -24,7 +24,7 @@ PreReq: %fillup_prereq Requires: compiz Version: 0.0.1_git080201 -Release: 53 +Release: 56 Summary: A wrapper script to launch Compiz with proper options BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 @@ -40,6 +40,7 @@ Patch5: compiz-manager-blacklist-865G.patch # PATCH-FIX-UPSTREAM compiz-manager-detect-multiple-graphic-cards.patch bnc#440273 rodrigo(a)novell.com -- Detect more than 1 graphic card Patch6: compiz-manager-detect-multiple-graphic-cards.patch +Patch7: bug-469785-disable-loose-binding.diff ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 BuildArch: noarch @@ -64,6 +65,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 +%patch7 -p0 %install %__install -d -m 755 %{buildroot}/%{_bindir} @@ -81,13 +83,15 @@ %{_datadir}/compiz-manager/* %changelog +* Tue Feb 24 2009 davidr(a)novell.com +- Disable use of --loose-binding option (bnc#469785) * Tue Jan 27 2009 rodrigo(a)novell.com - Detect correctly when running on more than 1 graphic card (bnc#440273) * Tue Dec 02 2008 rodrigo(a)novell.com - Remove Intel 965GM from the black list (bnc#444482) * Tue Nov 18 2008 rodrigo(a)novell.com - Review and merge changes from X11:Compiz -* Tue Nov 18 2008 cyberorg(a)opensuse.org +* Mon Nov 17 2008 cyberorg(a)opensuse.org - compiz-manager-blacklist-865G.patch from mmeeks(a)novell.com Remove Intel 865G till upstream mesa get fixed (bnc#445690) * Thu Nov 06 2008 rodrigo(a)novell.com @@ -125,7 +129,7 @@ - remove extra deps - build for all archs that xgl supports - add Compiz.desktop source -* Tue Mar 11 2008 cyberorg(a)cyberorg.info +* Mon Mar 10 2008 cyberorg(a)cyberorg.info - cleanup spec - remove --sm-client-id * Fri Feb 01 2008 cyberorg(a)cyberorg.info ++++++ bug-469785-disable-loose-binding.diff ++++++ diff -u ../compiz-manager-0.0.1_git080201/compiz-manager ./compiz-manager --- ../compiz-manager-0.0.1_git080201/compiz-manager 2008-03-13 09:16:12.000000000 -0400 +++ ./compiz-manager 2009-02-24 09:55:51.000000000 -0500 @@ -332,11 +332,11 @@ if [ "x$INDIRECT" = "xyes" ]; then COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering " fi - if check_nvidia; then - if [ "x$INDIRECT" != "xyes" ]; then - COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding" - fi - fi +# if check_nvidia; then +# if [ "x$INDIRECT" != "xyes" ]; then +# COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding" +# fi +# fi } #################### ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 beagle-index for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package beagle-index for openSUSE:Factory checked in at Thu Feb 26 16:33:48 CET 2009. -------- --- GNOME/beagle-index/beagle-index.changes 2009-02-13 13:08:32.000000000 +0100 +++ beagle-index/beagle-index.changes 2009-02-24 15:24:12.024881000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 24 15:24:07 CET 2009 - coolo(a)suse.de + +- sane is dropped + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle-index.spec ++++++ --- /var/tmp/diff_new_pack.ly1010/_old 2009-02-26 16:32:03.000000000 +0100 +++ /var/tmp/diff_new_pack.ly1010/_new 2009-02-26 16:32:03.000000000 +0100 @@ -54,7 +54,6 @@ %endif # PATTERN gnome-10.2-157.i586.pat BuildRequires: opensuse-gnomeuser_en -BuildRequires: xsane # PATTERN gnome_basis-10.2-157.i586.pat BuildRequires: gdm BuildRequires: gnome-panel @@ -260,7 +259,6 @@ BuildRequires: numlockx BuildRequires: openssh-askpass BuildRequires: pkgconfig -BuildRequires: sane-frontends BuildRequires: sax2 BuildRequires: sax2-gui BuildRequires: tcl @@ -346,15 +344,13 @@ # Extras needed to get this to build # have choice for chess_backend needed by knights: gnuchess crafty phalanx BuildRequires: gnuchess -# have choice for libgimp-2.0.so.0 needed by sane-frontends: gimp gimp-unstable -BuildRequires: gimp %define prefix /usr %define sysconfdir /etc/ License: GPL v2 or later Group: Productivity/Other AutoReqProv: on Version: 11.0_20080516 -Release: 100 +Release: 101 Source0: beagle-crawl-system Source1: beagle-merge-indexes PreReq: beagle @@ -394,6 +390,8 @@ %attr(755,root,root) /usr/sbin/beagle-merge-indexes %changelog +* Tue Feb 24 2009 coolo(a)suse.de +- sane is dropped * Fri Feb 13 2009 coolo(a)suse.de - remove all kde3 packages, we might want to add kde4 packages later ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 beagle for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package beagle for openSUSE:Factory checked in at Thu Feb 26 16:31:53 CET 2009. -------- --- GNOME/beagle/beagle.changes 2009-02-10 20:43:14.000000000 +0100 +++ beagle/beagle.changes 2009-02-26 01:58:24.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 26 01:57:59 CET 2009 - vuntz(a)novell.com + +- Update beagle-epiphany-version.patch to handle epiphany 2.26. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.q27408/_old 2009-02-26 16:28:48.000000000 +0100 +++ /var/tmp/diff_new_pack.q27408/_new 2009-02-26 16:28:48.000000000 +0100 @@ -29,7 +29,7 @@ Group: Productivity/Other AutoReqProv: on Version: 0.3.9 -Release: 2 +Release: 3 Summary: Desktop Search Application Url: http://beagle-project.org Source: %{name}-%{version}.tar.bz2 @@ -610,6 +610,8 @@ %{prefix}/lib/monodoc/sources/beagle-docs.* %changelog +* Thu Feb 26 2009 vuntz(a)novell.com +- Update beagle-epiphany-version.patch to handle epiphany 2.26. * Tue Feb 10 2009 vuntz(a)novell.com - Remove non-upstream translations: they'll get out-of-date. * Sat Jan 31 2009 mboman(a)suse.de ++++++ beagle-epiphany-version.patch ++++++ --- /var/tmp/diff_new_pack.q27408/_old 2009-02-26 16:28:49.000000000 +0100 +++ /var/tmp/diff_new_pack.q27408/_new 2009-02-26 16:28:49.000000000 +0100 @@ -7,7 +7,7 @@ dnl need to see the handling of the epiphany_version variable in the dnl epiphany extension code - VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" -+ VALID_EPIPHANY_VERSIONS="2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" ++ VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" for v in $VALID_EPIPHANY_VERSIONS; do AC_MSG_CHECKING([for Epiphany $v]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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