99246 2005-02-13 05:03:39 +0000 compiling KDE with --without-arts breaks notifications using external player. 2007-08-03 00:33:01 +0000 1 1 10 Unmaintained kdelibs knotify unspecified Gentoo Packages Linux RESOLVED FIXED NOR wishlist --- 1 inssomniak pfeiffer bugs farcaller flameeyes greg_g luka.mrovlje torre_cremata 205 oldest_to_newest 313387 0 inssomniak 2005-02-13 05:03:41 +0000 Version: (using KDE KDE 3.3.2) Installed from: Gentoo Packages Compiler: GCC 3.4 OS: Linux comiling kde with --without-arts as configure option (in gentoo linux, with the "-arts" use flag) knotify breaks, no system notifications are heard using an external player to play sounds. see this: http://bugs.gentoo.org/show_bug.cgi?id=79029 313488 1 coolo 2005-02-13 13:43:59 +0000 this is basically expected as --without-arts is a major hack and not well supported 319213 2 mail 2005-02-28 12:28:46 +0000 Same problem here. Since alsa dmix works perfectly there is no need for a soundserver any more, imho. So disabling it should be possible without breaking anything. 325094 3 ahd9ryi02 2005-03-18 07:29:32 +0000 I think the title of this bug should be renamed to "compiling KDE with --without-arts breaks all program notifications", as not everyone uses knotify to play sounds. Personally, I only use (or used to use, before they broke) knotify's message alerts. Is there any reason this bug hasn't been marked as confirmed? 326303 4 luka.mrovlje 2005-03-21 10:46:50 +0000 kde 3.4 doesn't solve the problem 327486 5 kde 2005-03-24 02:24:20 +0000 *** This bug has been confirmed by popular vote. *** 327502 6 inssomniak 2005-03-24 03:48:09 +0000 I can confirm as well kde 3.4 doesnt solve it, and yes all knotify notifications, including messages and sounds break. 327504 7 Merlin-TC 2005-03-24 03:57:33 +0000 I can confirm this as well. The whole notification system doesn't work anymore, not only sound but everything else eg. pop ups, stop working as well. 343113 8 tam 2005-05-18 12:01:04 +0000 Just another "/me too" - no system sounds at all without artsd. 346791 9 b.k.o 2005-06-01 02:36:47 +0000 I have the same problem. People should be able to use kde without arts. Alsa dmix is a better solution than a sound server for many people so abstracting arts from kde should be easier than it is. 348401 10 11365 francesco.doffizi 2005-06-07 16:19:01 +0000 Created attachment 11365 Patch for make knotify compile with -arts USE flag Don't know if it really works, I'm still compiling it. I've found this patch googling and I edited it to make a better -p1 patch. Try it and let me know if it works. If it doesn't it a good starting point, I think. 348497 11 mail 2005-06-07 23:15:42 +0000 It does not work for me... Did anybody succeed? 378051 12 mail 2005-10-01 22:03:47 +0000 KDE SVN from 2005-09-25 does not solve the problem (and I think it will not be addressed before 3.5 final?). Any chance to get this fixed any time? 378183 13 chetan13 2005-10-02 16:34:21 +0000 The genkdesvn ebuilds use a patch that allows notifications and sounds through external player even when kdelibs is compiled with --without-arts. Some of us(atleast one person other than me) have been using the patch since 2 months and have experienced no problems. Mario(the author of the ebuilds) even modified the patch to allow simultaneous sounds(the new kernels support this). Here is a link to the patch. http://svn.berlios.de/wsvn/genkdesvn/trunk/kde-base/kdelibs/files/kdelibs-7-knotify-noarts.patch?op=file&rev=0&sc=0 378738 14 mtanev 2005-10-04 06:39:38 +0000 Actually, although I have not heard complaints about the patch, the truth is that the "allow simultaneous sounds" functionality that I added, might be at the price of memory leaks, which I have not had the time to investigate thoroughly. Hence, I cannot really recommend this patch. This patch is adapted from another patch that just allowed knotify to be compiled --without-arts, so maybe it's a better idea to use the original patch instead. 439242 15 me 2006-05-16 13:46:14 +0000 It seems to work in post KDE 3.5.2 (almost 3.5.3). Can someone please verify? 439323 16 carstenlohrke 2006-05-16 17:42:38 +0000 > this is basically expected as --without-arts is a major hack and not well supported Stephan, users want to get rid of aRts in masses. And while it's not 100% perfect, as there're a few applications, which need it - is there a chance that you add the patch to kdelibs in perspective to 3.5.4 or a possible 3.6 (be it, with a big fat warning)? If so I'd add it to Gentoo to give it some testing. Apart from the applications depending on aRts, I don't see any problem with it. Am I missing something? 462837 17 dextermagnific 2006-08-24 09:06:07 +0000 Same problem here, i compiled 3.5.2, 3.5.3, 3.5.4 --without-arts and this problem has never been fixed. 477531 18 dextermagnific 2006-10-17 10:16:05 +0000 Again, the new version of KDE 3.3.5 doesn't play notifications when compiled without arts support and using external player. When do you plan to fix this bug ? (i saw already a patch from someone, and it is just a matter of commenting two lines starting with an #ifdef and if) 477532 19 dextermagnific 2006-10-17 10:17:19 +0000 Sorry it was the 3.5.5 version above. 477585 20 farcaller 2006-10-17 13:49:15 +0000 Seems to be broken in 3.5.5 478085 21 pfeiffer 2006-10-18 23:39:03 +0000 SVN commit 596924 by pfeiffer: support playing sounds even with --disable-arts apply patch from the bugreport, slightly edited (avoiding some #ifndefs by reordering some things) BUG: 99246 M +38 -5 knotify.cpp M +2 -0 knotify.h --- branches/KDE/3.5/kdelibs/arts/knotify/knotify.cpp #596923:596924 @@ -26,24 +26,29 @@ #include <sys/types.h> #include <sys/stat.h> +#include <config.h> +#ifndef WITHOUT_ARTS // aRts headers #include <connect.h> #include <dispatcher.h> #include <flowsystem.h> +#include <qiomanager.h> #include <soundserver.h> +#endif // QT headers #include <qfile.h> #include <qfileinfo.h> -#include <qiomanager.h> #include <qstringlist.h> #include <qtextstream.h> // KDE headers #include <dcopclient.h> #include <kaboutdata.h> +#ifndef WITHOUT_ARTS #include <kartsdispatcher.h> #include <kartsserver.h> +#endif #include <kcmdlineargs.h> #include <kconfig.h> #include <kdebug.h> @@ -53,8 +58,10 @@ #include <kpassivepopup.h> #include <kiconloader.h> #include <kmacroexpander.h> +#ifndef WITHOUT_ARTS #include <kplayobjectfactory.h> #include <kaudiomanagerplay.h> +#endif #include <kprocess.h> #include <kstandarddirs.h> #include <kuniqueapplication.h> @@ -73,22 +80,26 @@ QString externalPlayer; KProcess *externalPlayerProc; +#ifndef WITHOUT_ARTS QPtrList<KDE::PlayObject> playObjects; QMap<KDE::PlayObject*,int> playObjectEventMap; + KAudioManagerPlay *audioManager; +#endif int externalPlayerEventId; bool useExternal; bool useArts; int volume; QTimer *playTimer; - KAudioManagerPlay *audioManager; bool inStartup; QString startupEvents; }; // Yes, it's ugly to put this here, but this facilitates the cautious startup // procedure. +#ifndef WITHOUT_ARTS KArtsServer *soundServer = 0; +#endif extern "C"{ @@ -124,6 +135,7 @@ // We try to prevent this by tracking our startup and offer options to // abort this. +#ifndef WITHOUT_ARTS KConfigGroup config( KGlobal::config(), "StartProgress" ); KConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); @@ -208,14 +220,23 @@ config.writeEntry( "KNotify Init", true ); config.sync(); +#else + + // start notify service, without aRts + KNotify *notify = new KNotify( false ); + +#endif + app.dcopClient()->setDefaultObject( "Notify" ); app.dcopClient()->setDaemonMode( true ); // kdDebug() << "knotify starting" << endl; int ret = app.exec(); delete notify; +#ifndef WITHOUT_ARTS delete soundServer; delete dispatcher; +#endif return ret; } }// end extern "C" @@ -228,14 +249,16 @@ d->globalConfig = new KConfig("knotify.eventsrc", true, false); d->externalPlayerProc = 0; d->useArts = useArts; + d->inStartup = true; +#ifndef WITHOUT_ARTS d->playObjects.setAutoDelete(true); d->audioManager = 0; - d->inStartup = true; if( useArts ) { connect( soundServer, SIGNAL( restartedServer() ), this, SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } +#endif d->volume = 100; @@ -248,12 +271,14 @@ { reconfigure(); +#ifndef WITHOUT_ARTS d->playObjects.clear(); delete d->globalEvents; delete d->globalConfig; delete d->externalPlayerProc; delete d->audioManager; +#endif delete d; } @@ -449,6 +474,7 @@ return false; } +#ifndef WITHOUT_ARTS // play sound finally while( d->playObjects.count()>5 ) abortFirstPlayObject(); @@ -506,7 +532,7 @@ } if ( !d->playTimer->isActive() ) d->playTimer->start( 1000 ); - +#endif return true; } else if(!d->externalPlayer.isEmpty()) { @@ -661,6 +687,7 @@ void KNotify::playTimeout() { +#ifndef WITHOUT_ARTS for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it;) { QPtrListIterator< KDE::PlayObject > current = it; @@ -678,16 +705,18 @@ } if ( !d->playObjects.count() ) d->playTimer->stop(); +#endif } bool KNotify::isPlaying( const QString& soundFile ) const { +#ifndef WITHOUT_ARTS for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it; ++it) { if ( (*it)->mediaName() == soundFile ) return true; } - +#endif return false; } @@ -699,6 +728,7 @@ void KNotify::abortFirstPlayObject() { +#ifndef WITHOUT_ARTS QMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() ); if ( it != d->playObjectEventMap.end() ) { @@ -706,6 +736,7 @@ d->playObjectEventMap.remove( it ); } d->playObjects.removeFirst(); +#endif } void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason ) @@ -750,10 +781,12 @@ void KNotify::restartedArtsd() { +#ifndef WITHOUT_ARTS delete d->audioManager; d->audioManager = new KAudioManagerPlay( soundServer ); d->audioManager->setTitle( i18n( "KDE System Notifications" ) ); d->audioManager->setAutoRestoreID( "KNotify Aman Play" ); +#endif } void KNotify::sessionReady() --- branches/KDE/3.5/kdelibs/arts/knotify/knotify.h #596923:596924 @@ -23,7 +23,9 @@ #include <qobject.h> #include <knotifyclient.h> #include <dcopobject.h> +#ifndef WITHOUT_ARTS #include <soundserver.h> +#endif class KNotifyPrivate; class KProcess; 478111 22 flameeyes 2006-10-19 02:55:55 +0000 I'm not sure if that patch alone is good enough, considering that --without-arts disables the building of the whole arts subdirectory, thus effectively removing knotify from being built. 478112 23 flameeyes 2006-10-19 03:26:44 +0000 Just checked twice, and KNotify support is not built when passing --without-arts as the whole arts subdirectory is skipped. 478113 24 18184 flameeyes 2006-10-19 03:28:44 +0000 Created attachment 18184 Additional patch to actually enable knotify when --without-arts is passed I haven't compile-tested this yet, as I've just completed it and launched the build, but as I'm going to sleep better put it here in the mean time. This should enable only the arts/knotify subdirectory when building with --without-arts, finally allowing it to be built as intended. Will provide more information about it working/non-working state as soon as the build end. 478116 25 18185 flameeyes 2006-10-19 04:37:36 +0000 Created attachment 18185 Updated patch that works Okay this patch does build, haven't tested if it finally solves the problem though. soundserver.h is removed entirely from knotify.h as a) WITHOUT_ARTS is not defined in that context when building the stub b) it does not seem to be actually used by knotify.h itself. Rebuilding now from scratch to make sure it builds as intended, and then will test the rest. 478119 26 flameeyes 2006-10-19 06:58:03 +0000 Patch tested and checked, it works fine here. 478151 27 pfeiffer 2006-10-19 09:38:11 +0000 SVN commit 597017 by pfeiffer: apply patch by Diego Pettenò <flameeyes@gentoo.org> to build knotify at all when arts is disabled Thanks! BUG: 99246 M +4 -0 Makefile.am M +0 -1 configure.in.in M +2 -0 knotify/Makefile.am M +0 -3 knotify/knotify.h --- branches/KDE/3.5/kdelibs/arts/Makefile.am #597016:597017 @@ -1,4 +1,8 @@ +if include_ARTS SUBDIRS = kde knotify message +else +SUBDIRS = knotify +endif DOXYGEN_REFERENCES = kio kdecore kdeui include ../admin/Doxyfile.am --- branches/KDE/3.5/kdelibs/arts/configure.in.in #597016:597017 @@ -22,7 +22,6 @@ ARTS_OK=no if test "$build_arts" != "yes"; then - DO_NOT_COMPILE="$DO_NOT_COMPILE arts" AC_MSG_RESULT(disabled) else --- branches/KDE/3.5/kdelibs/arts/knotify/Makefile.am #597016:597017 @@ -6,7 +6,9 @@ kde_module_LTLIBRARIES = knotify.la knotify_la_SOURCES = knotify.cpp knotify.skel +if include_ARTS knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la +endif knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version knotify_la_METASOURCES = AUTO --- branches/KDE/3.5/kdelibs/arts/knotify/knotify.h #597016:597017 @@ -23,9 +23,6 @@ #include <qobject.h> #include <knotifyclient.h> #include <dcopobject.h> -#ifndef WITHOUT_ARTS -#include <soundserver.h> -#endif class KNotifyPrivate; class KProcess; 539299 28 pino 2007-08-03 00:33:01 +0000 *** Bug 93387 has been marked as a duplicate of this bug. *** 11365 2005-06-07 16:19:01 +0000 2005-06-07 16:19:01 +0000 Patch for make knotify compile with -arts USE flag knotify_no_arts.patch text/plain 7046 francesco.doffizi PyAua25vdGlmeS5jcHAuc3dwCj8gLnN3cApJbmRleDogTWFrZWZpbGUuYW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS Q1MgZmlsZTogL2hvbWUva2RlL2tkZWxpYnMvYXJ0cy9rbm90aWZ5L01ha2VmaWxlLmFtLHYKcmV0 cmlldmluZyByZXZpc2lvbiAxLjIyCmRpZmYgLXUgLTMgLXAgLXIxLjIyIGtkZWxpYnMtMy40LjAv YXJ0cy9rbm90aWZ5L01ha2VmaWxlLmFtCi0tLSBrZGVsaWJzLTMuNC4wL2FydHMva25vdGlmeS9N YWtlZmlsZS5hbQkyIFNlcCAyMDAzIDIyOjA4OjI0IC0wMDAwCTEuMjIKKysrIGtkZWxpYnMtMy40 LjAvYXJ0cy9rbm90aWZ5L01ha2VmaWxlLmFtCTYgQXByIDIwMDUgMjA6NDI6NTcgLTAwMDAKQEAg LTYsNyArNiw4IEBAIElOQ0xVREVTPSAtSSQodG9wX3NyY2RpcikvYXJ0cy9rZGUgLUkkKGkKIGtk ZV9tb2R1bGVfTFRMSUJSQVJJRVMgPSBrbm90aWZ5LmxhCiAKIGtub3RpZnlfbGFfU09VUkNFUwk9 IGtub3RpZnkuY3BwIGtub3RpZnkuc2tlbAota25vdGlmeV9sYV9MSUJBREQJPSAtbHNvdW5kc2Vy dmVyX2lkbCAtbHF0bWNvcCAkKExJQl9LREVVSSkgJCh0b3BfYnVpbGRkaXIpL2FydHMva2RlL2xp YmFydHNrZGUubGEKK2tub3RpZnlfbGFfTElCQURECT0KKwoga25vdGlmeV9sYV9MREZMQUdTID0g JChhbGxfbGlicmFyaWVzKSAtbW9kdWxlIC1hdm9pZC12ZXJzaW9uCiBrbm90aWZ5X2xhX01FVEFT T1VSQ0VTID0gQVVUTwogCkluZGV4OiBrbm90aWZ5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlbGlicy9hcnRzL2tub3RpZnkva25vdGlmeS5jcHAsdgpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuOTYKZGlmZiAtdSAtMyAtcCAtcjEuOTYga2RlbGlicy0zLjQuMC9hcnRzL2tub3Rp Znkva25vdGlmeS5jcHAKLS0tIGtkZWxpYnMtMy40LjAvYXJ0cy9rbm90aWZ5L2tub3RpZnkuY3Bw CTE3IE1hciAyMDA1IDE1OjI2OjA0IC0wMDAwCTEuOTYKKysrIGtkZWxpYnMtMy40LjAvYXJ0cy9r bm90aWZ5L2tub3RpZnkuY3BwCTYgQXByIDIwMDUgMjA6NDI6NTcgLTAwMDAKQEAgLTI2LDI0ICsy NiwzMSBAQAogI2luY2x1ZGUgPHN5cy90eXBlcy5oPgogI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CiAK KyNpbmNsdWRlIDxjb25maWcuaD4KKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAvLyBhUnRzIGhlYWRl cnMKICNpbmNsdWRlIDxjb25uZWN0Lmg+CiAjaW5jbHVkZSA8ZGlzcGF0Y2hlci5oPgogI2luY2x1 ZGUgPGZsb3dzeXN0ZW0uaD4KICNpbmNsdWRlIDxzb3VuZHNlcnZlci5oPgorI2VuZGlmCiAKIC8v IFFUIGhlYWRlcnMKICNpbmNsdWRlIDxxZmlsZS5oPgogI2luY2x1ZGUgPHFmaWxlaW5mby5oPgor I2lmbmRlZiBXSVRIT1VUX0FSVFMKICNpbmNsdWRlIDxxaW9tYW5hZ2VyLmg+CisjZW5kaWYKICNp bmNsdWRlIDxxc3RyaW5nbGlzdC5oPgogI2luY2x1ZGUgPHF0ZXh0c3RyZWFtLmg+CiAKIC8vIEtE RSBoZWFkZXJzCiAjaW5jbHVkZSA8ZGNvcGNsaWVudC5oPgogI2luY2x1ZGUgPGthYm91dGRhdGEu aD4KKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAjaW5jbHVkZSA8a2FydHNkaXNwYXRjaGVyLmg+CiAj aW5jbHVkZSA8a2FydHNzZXJ2ZXIuaD4KKyNlbmRpZgogI2luY2x1ZGUgPGtjbWRsaW5lYXJncy5o PgogI2luY2x1ZGUgPGtjb25maWcuaD4KICNpbmNsdWRlIDxrZGVidWcuaD4KQEAgLTUzLDggKzYw LDEwIEBACiAjaW5jbHVkZSA8a3Bhc3NpdmVwb3B1cC5oPgogI2luY2x1ZGUgPGtpY29ubG9hZGVy Lmg+CiAjaW5jbHVkZSA8a21hY3JvZXhwYW5kZXIuaD4KKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAj aW5jbHVkZSA8a3BsYXlvYmplY3RmYWN0b3J5Lmg+CiAjaW5jbHVkZSA8a2F1ZGlvbWFuYWdlcnBs YXkuaD4KKyNlbmRpZgogI2luY2x1ZGUgPGtwcm9jZXNzLmg+CiAjaW5jbHVkZSA8a3N0YW5kYXJk ZGlycy5oPgogI2luY2x1ZGUgPGt1bmlxdWVhcHBsaWNhdGlvbi5oPgpAQCAtNzMsMjIgKzgyLDI4 IEBAIHB1YmxpYzoKICAgICBRU3RyaW5nIGV4dGVybmFsUGxheWVyOwogICAgIEtQcm9jZXNzICpl eHRlcm5hbFBsYXllclByb2M7CiAKKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAgICAgUVB0ckxpc3Q8 S0RFOjpQbGF5T2JqZWN0PiBwbGF5T2JqZWN0czsKICAgICBRTWFwPEtERTo6UGxheU9iamVjdCos aW50PiBwbGF5T2JqZWN0RXZlbnRNYXA7CisjZW5kaWYKICAgICBpbnQgZXh0ZXJuYWxQbGF5ZXJF dmVudElkOwogCiAgICAgYm9vbCB1c2VFeHRlcm5hbDsKICAgICBib29sIHVzZUFydHM7CiAgICAg aW50IHZvbHVtZTsKICAgICBRVGltZXIgKnBsYXlUaW1lcjsKKyNpZm5kZWYgV0lUSE9VVF9BUlRT CiAgICAgS0F1ZGlvTWFuYWdlclBsYXkgKmF1ZGlvTWFuYWdlcjsKKyNlbmRpZgogICAgIGJvb2wg aW5TdGFydHVwOwogICAgIFFTdHJpbmcgc3RhcnR1cEV2ZW50czsKIH07CiAKIC8vIFllcywgaXQn cyB1Z2x5IHRvIHB1dCB0aGlzIGhlcmUsIGJ1dCB0aGlzIGZhY2lsaXRhdGVzIHRoZSBjYXV0aW91 cyBzdGFydHVwCiAvLyBwcm9jZWR1cmUuCisjaWZuZGVmIFdJVEhPVVRfQVJUUwogS0FydHNTZXJ2 ZXIgKnNvdW5kU2VydmVyID0gMDsKKyNlbmRpZgogCiBleHRlcm4gIkMiewogCkBAIC0xNTksMTIg KzE3NCwxNCBAQCBLREVfRVhQT1JUIGludCBrZGVtYWluKGludCBhcmdjLCBjaGFyICoqCiAgICAg Y29uZmlnLndyaXRlRW50cnkoICJVc2UgQXJ0cyIsIHVzZUFydHMgKTsKICAgICBjb25maWcuc3lu YygpOwogCisjaWZuZGVmIFdJVEhPVVRfQVJUUwogICAgIEtBcnRzRGlzcGF0Y2hlciAqZGlzcGF0 Y2hlciA9IDA7CiAgICAgaWYgKCB1c2VBcnRzICkKICAgICB7CiAgICAgICAgIGRpc3BhdGNoZXIg PSBuZXcgS0FydHNEaXNwYXRjaGVyOwogICAgICAgICBzb3VuZFNlcnZlciA9IG5ldyBLQXJ0c1Nl cnZlcjsKICAgICB9CisjZW5kaWYKIAogICAgIC8vIG9rLCBzZWVtZWQgdG8gd29yay4KICAgICBj b25maWcud3JpdGVFbnRyeSgiQXJ0cyBJbml0IiwgdXNlQXJ0cyApOwpAQCAtMTkwLDEwICsyMDcs MTIgQEAgS0RFX0VYUE9SVCBpbnQga2RlbWFpbihpbnQgYXJnYywgY2hhciAqKgogICAgICAgICAg ICAgID09IEtNZXNzYWdlQm94OjpObyApCiAgICAgICAgIHsKICAgICAgICAgICAgIHVzZUFydHMg PSBmYWxzZTsKKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAgICAgICAgICAgICBkZWxldGUgc291bmRT ZXJ2ZXI7CiAgICAgICAgICAgICBzb3VuZFNlcnZlciA9IDBMOwogICAgICAgICAgICAgZGVsZXRl IGRpc3BhdGNoZXI7CiAgICAgICAgICAgICBkaXNwYXRjaGVyID0gMEw7CisjZW5kaWYKICAgICAg ICAgfQogICAgIH0KIApAQCAtMjE0LDggKzIzMywxMCBAQCBLREVfRVhQT1JUIGludCBrZGVtYWlu KGludCBhcmdjLCBjaGFyICoqCiAKICAgICBpbnQgcmV0ID0gYXBwLmV4ZWMoKTsKICAgICBkZWxl dGUgbm90aWZ5OworI2lmbmRlZiBXSVRIT1VUX0FSVFMKICAgICBkZWxldGUgc291bmRTZXJ2ZXI7 CiAgICAgZGVsZXRlIGRpc3BhdGNoZXI7CisjZW5kaWYKICAgICByZXR1cm4gcmV0OwogfQogfS8v IGVuZCBleHRlcm4gIkMiCkBAIC0yMjgsMTQgKzI0OSwxOCBAQCBLTm90aWZ5OjpLTm90aWZ5KCBi b29sIHVzZUFydHMgKQogICAgIGQtPmdsb2JhbENvbmZpZyA9IG5ldyBLQ29uZmlnKCJrbm90aWZ5 LmV2ZW50c3JjIiwgdHJ1ZSwgZmFsc2UpOwogICAgIGQtPmV4dGVybmFsUGxheWVyUHJvYyA9IDA7 CiAgICAgZC0+dXNlQXJ0cyA9IHVzZUFydHM7CisjaWZuZGVmIFdJVEhPVVRfQVJUUwogICAgIGQt PnBsYXlPYmplY3RzLnNldEF1dG9EZWxldGUodHJ1ZSk7CiAgICAgZC0+YXVkaW9NYW5hZ2VyID0g MDsKKyNlbmRpZgogICAgIGQtPmluU3RhcnR1cCA9IHRydWU7CisjaWZuZGVmIFdJVEhPVVRfQVJU UwogICAgIGlmKCB1c2VBcnRzICkKICAgICB7CiAgICAgICAgIGNvbm5lY3QoIHNvdW5kU2VydmVy LCBTSUdOQUwoIHJlc3RhcnRlZFNlcnZlcigpICksIHRoaXMsIFNMT1QoIHJlc3RhcnRlZEFydHNk KCkgKSApOwogICAgICAgICByZXN0YXJ0ZWRBcnRzZCgpOyAvL3N0YXJ0ZWQgYWxscmVhZHkgbmVl ZCB0byBpbml0aWFsaXplIGQtPmF1ZGlvTWFuYWdlcgogICAgIH0KKyNlbmRpZgogCiAgICAgZC0+ dm9sdW1lID0gMTAwOwogCkBAIC0yNDgsMTIgKzI3MywxNCBAQCBLTm90aWZ5Ojp+S05vdGlmeSgp CiB7CiAgICAgcmVjb25maWd1cmUoKTsKIAorI2lmbmRlZiBXSVRIT1VUX0FSVFMKICAgICBkLT5w bGF5T2JqZWN0cy5jbGVhcigpOwogCiAgICAgZGVsZXRlIGQtPmdsb2JhbEV2ZW50czsKICAgICBk ZWxldGUgZC0+Z2xvYmFsQ29uZmlnOwogICAgIGRlbGV0ZSBkLT5leHRlcm5hbFBsYXllclByb2M7 CiAgICAgZGVsZXRlIGQtPmF1ZGlvTWFuYWdlcjsKKyNlbmRpZgogICAgIGRlbGV0ZSBkOwogfQog CkBAIC00NDksNiArNDc2LDcgQEAgYm9vbCBLTm90aWZ5Ojpub3RpZnlCeVNvdW5kKCBjb25zdCBR U3RyaQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKKyNpZm5kZWYgV0lU SE9VVF9BUlRTCiAgICAgICAgIC8vIHBsYXkgc291bmQgZmluYWxseQogICAgICAgICB3aGlsZSgg ZC0+cGxheU9iamVjdHMuY291bnQoKT41ICkKICAgICAgICAgICAgIGFib3J0Rmlyc3RQbGF5T2Jq ZWN0KCk7CkBAIC01MDgsNyArNTM2LDcgQEAgYm9vbCBLTm90aWZ5Ojpub3RpZnlCeVNvdW5kKCBj b25zdCBRU3RyaQogICAgICAgICB9CiAgICAgICAgIGlmICggIWQtPnBsYXlUaW1lci0+aXNBY3Rp dmUoKSApCiAgICAgICAgICAgICBkLT5wbGF5VGltZXItPnN0YXJ0KCAxMDAwICk7Ci0KKyNlbmRp ZgogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIH0gZWxzZSBpZighZC0+ZXh0ZXJuYWxQbGF5 ZXIuaXNFbXB0eSgpKSB7CkBAIC02NjMsNiArNjkxLDcgQEAgdm9pZCBLTm90aWZ5OjpzZXRWb2x1 bWUoIGludCB2b2x1bWUgKQogCiB2b2lkIEtOb3RpZnk6OnBsYXlUaW1lb3V0KCkKIHsKKyNpZm5k ZWYgV0lUSE9VVF9BUlRTCiAgICAgZm9yICggUVB0ckxpc3RJdGVyYXRvcjwgS0RFOjpQbGF5T2Jq ZWN0ID4gaXQoZC0+cGxheU9iamVjdHMpOyAqaXQ7KQogICAgIHsKICAgICAgICAgUVB0ckxpc3RJ dGVyYXRvcjwgS0RFOjpQbGF5T2JqZWN0ID4gY3VycmVudCA9IGl0OwpAQCAtNjgwLDE2ICs3MDks MTggQEAgdm9pZCBLTm90aWZ5OjpwbGF5VGltZW91dCgpCiAgICAgfQogICAgIGlmICggIWQtPnBs YXlPYmplY3RzLmNvdW50KCkgKQogICAgICAgICBkLT5wbGF5VGltZXItPnN0b3AoKTsKKyNlbmRp ZgogfQogCiBib29sIEtOb3RpZnk6OmlzUGxheWluZyggY29uc3QgUVN0cmluZyYgc291bmRGaWxl ICkgY29uc3QKIHsKKyNpZm5kZWYgV0lUSE9VVF9BUlRTCiAgICAgZm9yICggUVB0ckxpc3RJdGVy YXRvcjwgS0RFOjpQbGF5T2JqZWN0ID4gaXQoZC0+cGxheU9iamVjdHMpOyAqaXQ7ICsraXQpCiAg ICAgewogICAgICAgICBpZiAoICgqaXQpLT5tZWRpYU5hbWUoKSA9PSBzb3VuZEZpbGUgKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotCisjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKQEAgLTcwMSw2ICs3MzIsNyBAQCB2b2lkIEtOb3RpZnk6OnNsb3RQbGF5ZXJQcm9jZXNz RXhpdGVkKCBLCiAKIHZvaWQgS05vdGlmeTo6YWJvcnRGaXJzdFBsYXlPYmplY3QoKQogeworI2lm bmRlZiBXSVRIT1VUX0FSVFMKICAgICBRTWFwPEtERTo6UGxheU9iamVjdCosaW50Pjo6SXRlcmF0 b3IgaXQgPSBkLT5wbGF5T2JqZWN0RXZlbnRNYXAuZmluZCggZC0+cGxheU9iamVjdHMuZ2V0Rmly c3QoKSApOwogICAgIGlmICggaXQgIT0gZC0+cGxheU9iamVjdEV2ZW50TWFwLmVuZCgpICkKICAg ICB7CkBAIC03MDgsNiArNzQwLDcgQEAgdm9pZCBLTm90aWZ5OjphYm9ydEZpcnN0UGxheU9iamVj dCgpCiAgICAgICAgIGQtPnBsYXlPYmplY3RFdmVudE1hcC5yZW1vdmUoIGl0ICk7CiAgICAgfQog ICAgIGQtPnBsYXlPYmplY3RzLnJlbW92ZUZpcnN0KCk7CisjZW5kaWYKIH0KIAogdm9pZCBLTm90 aWZ5Ojpzb3VuZEZpbmlzaGVkKCBpbnQgZXZlbnRJZCwgUGxheWluZ0ZpbmlzaGVkU3RhdHVzIHJl YXNvbiApCkBAIC03NTIsMTAgKzc4NSwxMiBAQCBXSWQgS05vdGlmeTo6Y2hlY2tXaW5JZCggY29u c3QgUVN0cmluZyAmCiAKIHZvaWQgS05vdGlmeTo6cmVzdGFydGVkQXJ0c2QoKQogeworI2lmbmRl ZiBXSVRIT1VUX0FSVFMKICAgICBkZWxldGUgZC0+YXVkaW9NYW5hZ2VyOwogICAgIGQtPmF1ZGlv TWFuYWdlciA9IG5ldyBLQXVkaW9NYW5hZ2VyUGxheSggc291bmRTZXJ2ZXIgKTsKICAgICBkLT5h dWRpb01hbmFnZXItPnNldFRpdGxlKCBpMThuKCAiS0RFIFN5c3RlbSBOb3RpZmljYXRpb25zIiAp ICk7CiAgICAgZC0+YXVkaW9NYW5hZ2VyLT5zZXRBdXRvUmVzdG9yZUlEKCAiS05vdGlmeSBBbWFu IFBsYXkiICk7CisjZW5kaWYKIH0KIAogdm9pZCBLTm90aWZ5OjpzZXNzaW9uUmVhZHkoKQpJbmRl eDoga25vdGlmeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJzL2FydHMv a25vdGlmeS9rbm90aWZ5LmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzEKZGlmZiAtdSAtMyAt cCAtcjEuMzEga2RlbGlicy0zLjQuMC9hcnRzL2tub3RpZnkva25vdGlmeS5oCi0tLSBrZGVsaWJz LTMuNC4wL2FydHMva25vdGlmeS9rbm90aWZ5LmgJMTYgU2VwIDIwMDQgMTA6MTg6MDggLTAwMDAJ MS4zMQorKysga2RlbGlicy0zLjQuMC9hcnRzL2tub3RpZnkva25vdGlmeS5oCTYgQXByIDIwMDUg MjA6NDI6NTcgLTAwMDAKQEAgLTIzLDcgKzIzLDkgQEAKICNpbmNsdWRlIDxxb2JqZWN0Lmg+CiAj aW5jbHVkZSA8a25vdGlmeWNsaWVudC5oPgogI2luY2x1ZGUgPGRjb3BvYmplY3QuaD4KKyNpZm5k ZWYgV0lUSE9VVF9BUlRTCiAjaW5jbHVkZSA8c291bmRzZXJ2ZXIuaD4KKyNlbmRpZgogCiBjbGFz cyBLTm90aWZ5UHJpdmF0ZTsKIGNsYXNzIEtQcm9jZXNzOwo= 18184 2006-10-19 03:28:44 +0000 2006-10-19 04:37:36 +0000 Additional patch to actually enable knotify when --without-arts is passed kdelibs-3.5.5-noarts-2.patch text/plain 1296 flameeyes SW5kZXg6IGtkZWxpYnMtMy41LjUvYXJ0cy9jb25maWd1cmUuaW4uaW4KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g a2RlbGlicy0zLjUuNS5vcmlnL2FydHMvY29uZmlndXJlLmluLmluCisrKyBrZGVsaWJzLTMuNS41 L2FydHMvY29uZmlndXJlLmluLmluCkBAIC0yMiw3ICsyMiw2IEBAIEFDX01TR19DSEVDS0lORyhm b3IgYVJ0cy0kQVJUU19XQU5UX1ZFUlMKIEFSVFNfT0s9bm8KIAogaWYgdGVzdCAiJGJ1aWxkX2Fy dHMiICE9ICJ5ZXMiOyB0aGVuCi0gIERPX05PVF9DT01QSUxFPSIkRE9fTk9UX0NPTVBJTEUgYXJ0 cyIKICAgQUNfTVNHX1JFU1VMVChkaXNhYmxlZCkKIGVsc2UKIApJbmRleDoga2RlbGlicy0zLjUu NS9hcnRzL2tub3RpZnkvTWFrZWZpbGUuYW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2RlbGlicy0zLjUuNS5v cmlnL2FydHMva25vdGlmeS9NYWtlZmlsZS5hbQorKysga2RlbGlicy0zLjUuNS9hcnRzL2tub3Rp ZnkvTWFrZWZpbGUuYW0KQEAgLTYsNyArNiw5IEBAIElOQ0xVREVTPSAtSSQodG9wX3NyY2Rpcikv YXJ0cy9rZGUgLUkkKGkKIGtkZV9tb2R1bGVfTFRMSUJSQVJJRVMgPSBrbm90aWZ5LmxhCiAKIGtu b3RpZnlfbGFfU09VUkNFUwk9IGtub3RpZnkuY3BwIGtub3RpZnkuc2tlbAoraWYgaW5jbHVkZV9B UlRTCiBrbm90aWZ5X2xhX0xJQkFERAk9IC1sc291bmRzZXJ2ZXJfaWRsIC1scXRtY29wICQoTElC X0tERVVJKSAkKHRvcF9idWlsZGRpcikvYXJ0cy9rZGUvbGliYXJ0c2tkZS5sYQorZW5kaWYKIGtu b3RpZnlfbGFfTERGTEFHUyA9ICQoYWxsX2xpYnJhcmllcykgLW1vZHVsZSAtYXZvaWQtdmVyc2lv bgoga25vdGlmeV9sYV9NRVRBU09VUkNFUyA9IEFVVE8KIApJbmRleDoga2RlbGlicy0zLjUuNS9h cnRzL01ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtkZWxpYnMtMy41LjUub3JpZy9hcnRzL01h a2VmaWxlLmFtCisrKyBrZGVsaWJzLTMuNS41L2FydHMvTWFrZWZpbGUuYW0KQEAgLTEsNCArMSw4 IEBACitpZiBpbmNsdWRlX0FSVFMKIFNVQkRJUlMgPSBrZGUga25vdGlmeSBtZXNzYWdlCitlbHNl CitTVUJESVJTID0ga25vdGlmeQorZW5kaWYKIAogRE9YWUdFTl9SRUZFUkVOQ0VTID0ga2lvIGtk ZWNvcmUga2RldWkKIGluY2x1ZGUgLi4vYWRtaW4vRG94eWZpbGUuYW0K 18185 2006-10-19 04:37:36 +0000 2006-10-19 04:37:36 +0000 Updated patch that works kdelibs-3.5.5-noarts-2.patch text/plain 1686 flameeyes SW5kZXg6IGtkZWxpYnMtMy41LjUvYXJ0cy9jb25maWd1cmUuaW4uaW4KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g a2RlbGlicy0zLjUuNS5vcmlnL2FydHMvY29uZmlndXJlLmluLmluCisrKyBrZGVsaWJzLTMuNS41 L2FydHMvY29uZmlndXJlLmluLmluCkBAIC0yMiw3ICsyMiw2IEBAIEFDX01TR19DSEVDS0lORyhm b3IgYVJ0cy0kQVJUU19XQU5UX1ZFUlMKIEFSVFNfT0s9bm8KIAogaWYgdGVzdCAiJGJ1aWxkX2Fy dHMiICE9ICJ5ZXMiOyB0aGVuCi0gIERPX05PVF9DT01QSUxFPSIkRE9fTk9UX0NPTVBJTEUgYXJ0 cyIKICAgQUNfTVNHX1JFU1VMVChkaXNhYmxlZCkKIGVsc2UKIApJbmRleDoga2RlbGlicy0zLjUu NS9hcnRzL2tub3RpZnkvTWFrZWZpbGUuYW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2RlbGlicy0zLjUuNS5v cmlnL2FydHMva25vdGlmeS9NYWtlZmlsZS5hbQorKysga2RlbGlicy0zLjUuNS9hcnRzL2tub3Rp ZnkvTWFrZWZpbGUuYW0KQEAgLTYsNyArNiw5IEBAIElOQ0xVREVTPSAtSSQodG9wX3NyY2Rpcikv YXJ0cy9rZGUgLUkkKGkKIGtkZV9tb2R1bGVfTFRMSUJSQVJJRVMgPSBrbm90aWZ5LmxhCiAKIGtu b3RpZnlfbGFfU09VUkNFUwk9IGtub3RpZnkuY3BwIGtub3RpZnkuc2tlbAoraWYgaW5jbHVkZV9B UlRTCiBrbm90aWZ5X2xhX0xJQkFERAk9IC1sc291bmRzZXJ2ZXJfaWRsIC1scXRtY29wICQoTElC X0tERVVJKSAkKHRvcF9idWlsZGRpcikvYXJ0cy9rZGUvbGliYXJ0c2tkZS5sYQorZW5kaWYKIGtu b3RpZnlfbGFfTERGTEFHUyA9ICQoYWxsX2xpYnJhcmllcykgLW1vZHVsZSAtYXZvaWQtdmVyc2lv bgoga25vdGlmeV9sYV9NRVRBU09VUkNFUyA9IEFVVE8KIApJbmRleDoga2RlbGlicy0zLjUuNS9h cnRzL01ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtkZWxpYnMtMy41LjUub3JpZy9hcnRzL01h a2VmaWxlLmFtCisrKyBrZGVsaWJzLTMuNS41L2FydHMvTWFrZWZpbGUuYW0KQEAgLTEsNCArMSw4 IEBACitpZiBpbmNsdWRlX0FSVFMKIFNVQkRJUlMgPSBrZGUga25vdGlmeSBtZXNzYWdlCitlbHNl CitTVUJESVJTID0ga25vdGlmeQorZW5kaWYKIAogRE9YWUdFTl9SRUZFUkVOQ0VTID0ga2lvIGtk ZWNvcmUga2RldWkKIGluY2x1ZGUgLi4vYWRtaW4vRG94eWZpbGUuYW0KSW5kZXg6IGtkZWxpYnMt My41LjUvYXJ0cy9rbm90aWZ5L2tub3RpZnkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrZGVsaWJzLTMuNS41 Lm9yaWcvYXJ0cy9rbm90aWZ5L2tub3RpZnkuaAorKysga2RlbGlicy0zLjUuNS9hcnRzL2tub3Rp Znkva25vdGlmeS5oCkBAIC0yMyw5ICsyMyw2IEBACiAjaW5jbHVkZSA8cW9iamVjdC5oPgogI2lu Y2x1ZGUgPGtub3RpZnljbGllbnQuaD4KICNpbmNsdWRlIDxkY29wb2JqZWN0Lmg+Ci0jaWZuZGVm IFdJVEhPVVRfQVJUUwotI2luY2x1ZGUgPHNvdW5kc2VydmVyLmg+Ci0jZW5kaWYKIAogY2xhc3Mg S05vdGlmeVByaXZhdGU7CiBjbGFzcyBLUHJvY2VzczsK