November 2013 - openSUSE Commits - openSUSE Mailing Lists

commit phonon-backend-vlc for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package phonon-backend-vlc for openSUSE:Factory checked in at 2013-11-04 16:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-vlc (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon-backend-vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-vlc/phonon-backend-vlc.changes 2013-10-08 11:04:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes 2013-11-04 16:10:40.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 4 12:40:08 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 0.7.0~git20131104 + * Buildsystem fixes since previous snapshot + * Version bump to 0.7.0 + +------------------------------------------------------------------- Old: ---- phonon-backend-vlc-0.6.80~git20130930.tar.xz New: ---- phonon-backend-vlc-0.7.0~git20131104.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-vlc.spec ++++++ --- /var/tmp/diff_new_pack.tgEhwI/_old 2013-11-04 16:10:41.000000000 +0100 +++ /var/tmp/diff_new_pack.tgEhwI/_new 2013-11-04 16:10:41.000000000 +0100 @@ -17,20 +17,20 @@ Name: phonon-backend-vlc -Version: 0.6.80~git20130930 +Version: 0.7.0~git20131104 Release: 0 Summary: Phonon VLC Backend License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://phonon.kde.org/ -%define _phonon_version 4.6.80~git20130930 +%define _phonon_version 4.7.0~git20131104 Source0: %{name}-%{version}.tar.xz BuildRequires: alsa-devel BuildRequires: automoc4 BuildRequires: cmake BuildRequires: fdupes BuildRequires: kde4-filesystem -BuildRequires: phonon-devel >= 4.6.80~git20130930 +BuildRequires: phonon-devel >= 4.7.0~git20131104 BuildRequires: pkgconfig BuildRequires: vlc-devel >= 2.0.1 Requires: libphonon4 => %{_phonon_version} ++++++ phonon-backend-vlc-0.6.80~git20130930.tar.xz -> phonon-backend-vlc-0.7.0~git20131104.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/CMakeLists.txt new/phonon-backend-vlc-0.7.0~git20131104/CMakeLists.txt --- old/phonon-backend-vlc-0.6.80~git20130930/CMakeLists.txt 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/CMakeLists.txt 2013-11-04 13:00:01.000000000 +0100 @@ -5,8 +5,13 @@ # Phonon find_package(Phonon REQUIRED) -macro_ensure_version("4.6.80" ${PHONON_VERSION} PHONON_FOUND) -macro_log_feature(PHONON_FOUND "Phonon" "Core Library" "git://anongit.kde.org/phonon.git" TRUE "4.6.80") +macro_ensure_version("4.7.0" ${PHONON_VERSION} PHONON_FOUND) +macro_log_feature(PHONON_FOUND "Phonon" "Core Library" "git://anongit.kde.org/phonon.git" TRUE "4.7.0") + +# LibVLC +find_package(LIBVLC REQUIRED) +macro_ensure_version("2.0.1" ${LIBVLC_VERSION} LIBVLC_FOUND) +macro_log_feature(LIBVLC_FOUND "LibVLC" "VLC C API Library" "git://git.videolan.org/vlc.git" TRUE "2.0.1") if(PHONON_FOUND_EXPERIMENTAL) add_definitions(-DPHONON_EXPERIMENTAL) @@ -14,17 +19,13 @@ add_definitions(-DPHONON_VLC_NO_EXPERIMENTAL) endif(PHONON_FOUND_EXPERIMENTAL) -# libVLC -set(LIBVLC_MIN_VERSION "2.0.1") -find_package(LIBVLC REQUIRED) - add_definitions(${QT_DEFINITIONS}) include_directories(${PHONON_INCLUDES} ${QT_INCLUDES} ${LIBVLC_INCLUDE_DIR} ${LIBVLC_INCLUDE_DIR}/vlc/plugins) set(PHONON_VLC_MAJOR_VERSION "0") -set(PHONON_VLC_MINOR_VERSION "6") -set(PHONON_VLC_PATCH_VERSION "80") +set(PHONON_VLC_MINOR_VERSION "7") +set(PHONON_VLC_PATCH_VERSION "0") set(PHONON_VLC_VERSION "${PHONON_VLC_MAJOR_VERSION}.${PHONON_VLC_MINOR_VERSION}.${PHONON_VLC_PATCH_VERSION}") add_definitions(-DPHONON_VLC_VERSION="${PHONON_VLC_VERSION}") @@ -32,3 +33,5 @@ include(MimeTypes.cmake) add_subdirectory(src) + +macro_display_feature_log() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/CMakeLists.txt new/phonon-backend-vlc-0.7.0~git20131104/src/CMakeLists.txt --- old/phonon-backend-vlc-0.6.80~git20130930/src/CMakeLists.txt 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/CMakeLists.txt 2013-11-04 13:00:01.000000000 +0100 @@ -19,13 +19,13 @@ endif (MSVC) if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at 4.6.50 - message("Building against Phonon 4.7 API") + message(STATUS "Building against Phonon 4.7 API") add_definitions(-DPHONON_BACKEND_VERSION_4_7) elseif(${PHONON_VERSION} VERSION_GREATER "4.1.99") - message("Building against Phonon 4.2 API") + message(STATUS "Building against Phonon 4.2 API") add_definitions(-DPHONON_BACKEND_VERSION_4_2) else() - message("Building against Phonon 4.0 API") + message(STATUS "Building against Phonon 4.0 API") endif() set(phonon_vlc_SRCS @@ -80,11 +80,7 @@ ${LIBVLC_LIBRARY} ) -if(WIN32) - install(TARGETS phonon_vlc DESTINATION bin/phonon_backend) -else(WIN32) - install(TARGETS phonon_vlc DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_backend) -endif(WIN32) +install(TARGETS phonon_vlc DESTINATION ${BACKEND_INSTALL_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/utils/mime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/utils/mime.h @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/audio/audiooutput.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/audio/audiooutput.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/audio/audiooutput.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/audio/audiooutput.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -45,6 +45,7 @@ void AudioOutput::handleConnectToMediaObject(MediaObject *mediaObject) { + Q_UNUSED(mediaObject); setOutputDeviceImplementation(); if (!PulseSupport::getInstance()->isActive()) applyVolume(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/backend.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/backend.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/backend.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/backend.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -120,7 +120,7 @@ #endif } else { #ifdef __GNUC__ -#warning TODO - this error message is about as useful as a cooling unit in the arctic + #warning TODO - this error message is as useful as a knife at a gun fight #endif QMessageBox msg; msg.setIcon(QMessageBox::Critical); @@ -165,13 +165,9 @@ return new MediaObject(parent); case AudioOutputClass: return new AudioOutput(parent); -#ifdef __GNUC__ -#warning using sout in VLC2 breaks libvlcs vout functions, see vlc bug 6992 -// https://trac.videolan.org/vlc/ticket/6992 -#endif #if (LIBVLC_VERSION_INT < LIBVLC_VERSION(2, 0, 0, 0)) - // FWIW: the case is inside the if because that gives clear indication which - // frontend objects are not supported! + // Broken >= 2.0 + // https://trac.videolan.org/vlc/ticket/6992 case AudioDataOutputClass: return new AudioDataOutput(parent); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/effect.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/effect.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/effect.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/effect.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -33,6 +33,8 @@ : QObject(p_parent) , SinkNode() { + Q_UNUSED(p_em); + Q_UNUSED(i_effectId); // p_effectManager = p_em; // const QList<EffectInfo> effects = p_effectManager->effects(); @@ -51,7 +53,7 @@ parameterList.clear(); } -void Effect::handleConnectToMediaObject(MediaObject *p_media_object) +void Effect::handleConnectToMediaObject(MediaObject *) { switch (effect_type) { case EffectInfo::AudioEffect: @@ -65,7 +67,7 @@ } } -void Effect::handleDisconnectFromMediaObject(MediaObject *p_media_object) +void Effect::handleDisconnectFromMediaObject(MediaObject *) { switch (effect_type) { case EffectInfo::AudioEffect: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/effectmanager.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/effectmanager.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/effectmanager.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/effectmanager.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -79,8 +79,11 @@ QObject *EffectManager::createEffect(int id, QObject *parent) { + Q_UNUSED(id); #if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 0, 0)) return new EqualizerEffect(parent); +#else + Q_UNUSED(parent); #endif return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/mediacontroller.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/mediacontroller.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/mediacontroller.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediacontroller.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -306,13 +306,13 @@ const QString file = url.toLocalFile(); if (!m_player->setSubtitle(file)) error() << "libVLC failed to set subtitle file:" << LibVLC::errorMessage(); -#warning report upstream wish // Unfortunately the addition of SPUs does not trigger an event in the // VLC mediaplayer, yet the actual addition to the descriptor is async. // So for the time being our best shot at getting an up-to-date list of SPUs // is shooting in the dark and hoping we hit something. // Refresha after 1, 2 and 5 seconds. If we have no updated list after 5 // seconds we are out of luck. + // https://trac.videolan.org/vlc/ticket/9796 QObject *mediaObject = dynamic_cast<QObject *>(this); // MediaObject : QObject, MediaController m_refreshTimer->singleShot(1 * 1000, mediaObject, SLOT(refreshDescriptors())); m_refreshTimer->singleShot(2 * 1000, mediaObject, SLOT(refreshDescriptors())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/mediaobject.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/mediaobject.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/mediaobject.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediaobject.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -543,9 +543,12 @@ if (!m_subtitleFontChanged) // Update font settings m_subtitleFont = QFont(); +#ifdef __GNUC__ #warning freetype module is not working as expected - font api not working +#endif // BUG: VLC's freetype module doesn't pick up per-media options // vlc -vvvv --freetype-font="Comic Sans MS" multiple_sub_sample.mkv :freetype-font=Arial + // https://trac.videolan.org/vlc/ticket/9797 m_media->addOption(QLatin1String(":freetype-font="), m_subtitleFont.family()); m_media->addOption(QLatin1String(":freetype-fontsize="), m_subtitleFont.pointSize()); if (m_subtitleFont.bold()) @@ -644,7 +647,6 @@ debug() << state; debug() << "attempted autoplay?" << m_attemptingAutoplay; -#warning report upstream: lack of track information on cdda-trakc specific media if (m_attemptingAutoplay) { switch (state) { case MediaPlayer::PlayingState: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/mediaplayer.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/mediaplayer.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/mediaplayer.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediaplayer.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -47,12 +47,12 @@ namespace Phonon { namespace VLC { -MediaPlayer::MediaPlayer(QObject *parent) : - QObject(parent), - m_player(libvlc_media_player_new(libvlc)), - m_doingPausedPlay(false), - m_fadeAmount(1.0f), - m_volume(75) +MediaPlayer::MediaPlayer(QObject *parent) + : QObject(parent) + , m_player(libvlc_media_player_new(libvlc)) + , m_doingPausedPlay(false) + , m_volume(75) + , m_fadeAmount(1.0f) { Q_ASSERT(m_player); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/phonon-vlc.json.in new/phonon-backend-vlc-0.7.0~git20131104/src/phonon-vlc.json.in --- old/phonon-backend-vlc-0.6.80~git20130930/src/phonon-vlc.json.in 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/phonon-vlc.json.in 2013-11-04 13:00:01.000000000 +0100 @@ -5,5 +5,5 @@ "Website": "http://www.videolan.org", "InterfaceVersion": 0, - "InitialPreference": 10 + "InitialPreference": 20 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/video/videodataoutput.cpp new/phonon-backend-vlc-0.7.0~git20131104/src/video/videodataoutput.cpp --- old/phonon-backend-vlc-0.6.80~git20130930/src/video/videodataoutput.cpp 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/video/videodataoutput.cpp 2013-11-04 13:00:01.000000000 +0100 @@ -50,11 +50,13 @@ void VideoDataOutput::handleConnectToMediaObject(MediaObject *mediaObject) { + Q_UNUSED(mediaObject); setCallbacks(m_player); } void VideoDataOutput::handleDisconnectFromMediaObject(MediaObject *mediaObject) { + Q_UNUSED(mediaObject); unsetCallbacks(m_player); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/vlc.desktop.cmake new/phonon-backend-vlc-0.7.0~git20131104/src/vlc.desktop.cmake --- old/phonon-backend-vlc-0.6.80~git20130930/src/vlc.desktop.cmake 2013-09-30 16:33:59.000000000 +0200 +++ new/phonon-backend-vlc-0.7.0~git20131104/src/vlc.desktop.cmake 2013-11-04 13:00:01.000000000 +0100 @@ -7,7 +7,7 @@ X-KDE-PhononBackendInfo-Version=@PHONON_VLC_VERSION@ X-KDE-PhononBackendInfo-Website=http://www.videolan.org/ Icon=vlc -InitialPreference=10 +InitialPreference=20 Name=VLC Name[bg]=VLC -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phonon-backend-gstreamer-0_10 for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package phonon-backend-gstreamer-0_10 for openSUSE:Factory checked in at 2013-11-04 16:09:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10 (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon-backend-gstreamer-0_10" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10/phonon-backend-gstreamer-0_10.changes 2013-09-16 12:38:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new/phonon-backend-gstreamer-0_10.changes 2013-11-04 16:09:36.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 4 12:35:53 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 4.7.0~git20131104 + * Buildsystem fixes since previous snapshot + * Version bump to 4.7.0 + +------------------------------------------------------------------- Old: ---- phonon-backend-gstreamer-4.6.80~git20130915.tar.xz New: ---- phonon-backend-gstreamer-4.7.0~git20131104.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.EO8p8M/_old 2013-11-04 16:09:36.000000000 +0100 +++ /var/tmp/diff_new_pack.EO8p8M/_new 2013-11-04 16:09:36.000000000 +0100 @@ -17,14 +17,14 @@ Name: phonon-backend-gstreamer-0_10 -Version: 4.6.80~git20130915 +Version: 4.7.0~git20131104 Release: 0 Summary: Phonon Multimedia Platform Abstraction License: LGPL-2.0+ Group: System/GUI/KDE Url: http://phonon.kde.org/ %define filename phonon-backend-gstreamer -%define _phonon_version 4.6.80~git20130915 +%define _phonon_version 4.7.0~git20131104 Source0: %{filename}-%{version}.tar.xz # PATCH-FIX-UPSTREAM 0001-Fix-no-return-in-nonvoid-function.patch -- fixes build issue detected by post-build-checks Patch0: 0001-Fix-no-return-in-nonvoid-function.patch @@ -34,7 +34,7 @@ BuildRequires: fdupes BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: kde4-filesystem -BuildRequires: phonon-devel >= 4.6.80~git20130915 +BuildRequires: phonon-devel >= 4.7.0~git20131104 BuildRequires: update-desktop-files BuildRequires: xz Requires: libphonon4 => %{_phonon_version} ++++++ phonon-backend-gstreamer-4.6.80~git20130915.tar.xz -> phonon-backend-gstreamer-4.7.0~git20131104.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/.gitignore new/phonon-backend-gstreamer-4.7.0~git20131104/.gitignore --- old/phonon-backend-gstreamer-4.6.80~git20130915/.gitignore 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/.gitignore 2013-11-04 12:52:32.000000000 +0100 @@ -1,2 +1,3 @@ *.swp build +build5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/CMakeLists.txt new/phonon-backend-gstreamer-4.7.0~git20131104/CMakeLists.txt --- old/phonon-backend-gstreamer-4.6.80~git20130915/CMakeLists.txt 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/CMakeLists.txt 2013-11-04 12:52:32.000000000 +0100 @@ -6,30 +6,18 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(Phonon REQUIRED) -macro_ensure_version("4.6.80" ${PHONON_VERSION} PHONON_FOUND) -macro_log_feature(PHONON_FOUND "Phonon" "Core Library" "git://anongit.kde.org/phonon.git" TRUE "4.6.80") +macro_ensure_version("4.7.0" ${PHONON_VERSION} PHONON_FOUND) +macro_log_feature(PHONON_FOUND "Phonon" "Core Library" "git://anongit.kde.org/phonon.git" TRUE "4.7.0") add_definitions(${QT_DEFINITIONS}) include_directories(${PHONON_INCLUDES} ${QT_INCLUDES}) set(PHONON_GST_MAJOR_VERSION "4") -set(PHONON_GST_MINOR_VERSION "6") -set(PHONON_GST_PATCH_VERSION "80") +set(PHONON_GST_MINOR_VERSION "7") +set(PHONON_GST_PATCH_VERSION "0") set(PHONON_GST_VERSION "${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}") add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}") add_subdirectory(gstreamer) macro_display_feature_log() - -add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz - COMMAND - git archive --prefix=phonon-backend-gstreamer-${PHONON_GST_VERSION}/ HEAD | xz > ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -add_custom_target( - dist - DEPENDS ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/CMakeLists.txt new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/CMakeLists.txt --- old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/CMakeLists.txt 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/CMakeLists.txt 2013-11-04 12:52:32.000000000 +0100 @@ -95,7 +95,7 @@ target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY}) endif(OPENGL_FOUND) - install(TARGETS phonon_gstreamer DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_backend) + install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR}) if(PHONON_BUILD_PHONON4QT5) # Instead of desktop files we are embedding the information into the plugin itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/medianode.cpp new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/medianode.cpp --- old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/medianode.cpp 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/medianode.cpp 2013-11-04 12:52:32.000000000 +0100 @@ -43,12 +43,14 @@ if (description & AudioSource) { m_audioTee = gst_element_factory_make("tee", NULL); + Q_ASSERT(m_audioTee); // Must not ever be null. gst_object_ref (GST_OBJECT (m_audioTee)); gst_object_sink (GST_OBJECT (m_audioTee)); } if (description & VideoSource) { m_videoTee = gst_element_factory_make("tee", NULL); + Q_ASSERT(m_videoTee); // Must not ever be null. gst_object_ref (GST_OBJECT (m_videoTee)); gst_object_sink (GST_OBJECT (m_videoTee)); } @@ -300,11 +302,13 @@ { // Rewire everything if ((description() & AudioSource)) { + Q_ASSERT(m_audioTee); if (!linkMediaNodeList(m_audioSinkList, root()->audioGraph(), m_audioTee, audioElement())) return false; } if ((description() & VideoSource)) { + Q_ASSERT(m_videoTee); if (!linkMediaNodeList(m_videoSinkList, root()->videoGraph(), m_videoTee, videoElement())) return false; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phonon for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at 2013-11-04 16:08:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon (Old) and /work/SRC/openSUSE:Factory/.phonon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon/phonon.changes 2013-10-01 08:20:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon.new/phonon.changes 2013-11-04 16:08:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 4 12:28:41 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 4.7.0~git20131104 + * Buildsystem fixes since previous snapshot + * Version bump to 4.7.0 + +------------------------------------------------------------------- Old: ---- phonon-4.6.80~git20130930.tar.xz New: ---- phonon-4.7.0~git20131104.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.W7MSuB/_old 2013-11-04 16:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.W7MSuB/_new 2013-11-04 16:08:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: phonon -Version: 4.6.80~git20130930 +Version: 4.7.0~git20131104 Release: 0 Summary: Multimedia Platform Abstraction License: LGPL-2.0+ ++++++ phonon-4.6.80~git20130930.tar.xz -> phonon-4.7.0~git20131104.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/.gitignore new/phonon-4.7.0~git20131104/.gitignore --- old/phonon-4.6.80~git20130930/.gitignore 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/.gitignore 2013-11-04 12:30:32.000000000 +0100 @@ -1,3 +1,4 @@ *.swp build +build5 apidocs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/CMakeLists.txt new/phonon-4.7.0~git20131104/CMakeLists.txt --- old/phonon-4.6.80~git20130930/CMakeLists.txt 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/CMakeLists.txt 2013-11-04 12:30:32.000000000 +0100 @@ -20,8 +20,8 @@ # It is highly advised to think twice before changing those. # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes -set(PHONON_LIB_MINOR_VERSION "6") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "80") # Bump whenever you feel like it :P +set(PHONON_LIB_MINOR_VERSION "7") # Only change on binary compatible changes with new interfaces +set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/PhononConfig.cmake.in new/phonon-4.7.0~git20131104/PhononConfig.cmake.in --- old/phonon-4.6.80~git20130930/PhononConfig.cmake.in 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/PhononConfig.cmake.in 2013-11-04 12:30:32.000000000 +0100 @@ -15,6 +15,7 @@ set(PHONON_LIBRARY_DIR "${rootDir}/@LIB_INSTALL_DIR@") set(PHONON_BUILDSYSTEM_DIR "${rootDir}/@BUILDSYSTEM_INSTALL_DIR@") +set(PHONON_LIB_SONAME "@PHONON_LIB_SONAME@") if(NOT TARGET Phonon::@PHONON_LIB_SONAME@) include(${currentDir}/PhononTargets.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/cmake/FindPhononInternal.cmake new/phonon-4.7.0~git20131104/cmake/FindPhononInternal.cmake --- old/phonon-4.6.80~git20130930/cmake/FindPhononInternal.cmake 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/cmake/FindPhononInternal.cmake 2013-11-04 12:30:32.000000000 +0100 @@ -182,6 +182,10 @@ if (PHONON_BUILD_PHONON4QT5) set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE) endif(PHONON_BUILD_PHONON4QT5) +set(BACKEND_INSTALL_DIR "${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend") +if(WIN32) # Imported from Phonon VLC + set(BACKEND_INSTALL_DIR "bin/${PHONON_LIB_SONAME}_backend") +endif() set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" CACHE PATH "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)") set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "The install dir for service (desktop, protocol, ...) files") if (PHONON_BUILD_PHONON4QT5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/doc/Phonon4Qt5.dox new/phonon-4.7.0~git20131104/doc/Phonon4Qt5.dox --- old/phonon-4.6.80~git20130930/doc/Phonon4Qt5.dox 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/doc/Phonon4Qt5.dox 2013-11-04 12:30:32.000000000 +0100 @@ -20,14 +20,17 @@ To build Phonon4Qt5 you will have to pass PHONON_BUILD_PHONON4QT5 to CMake to switch it into Qt5 build mode. -Additionally if you are build against a qt-project provided binary build of Qt5 -you may have to define the CMAKE_PREFIX_PATH to make CMake find Qt5. +Additionally if you are building against a qt-project provided binary build of Qt5 +you may have to define the CMAKE_PREFIX_PATH to make CMake find Qt5. If you are +using QMake for your application you will additionally have to instruct cmake to +install Qt extensions into the actual Qt directory using +PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT. For example: \verbatim mkdir build5 cd build5 -cmake .. -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 +cmake .. -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \endverbatim Phonon4Qt5 installation does not conflict with regular Phonon installations in @@ -68,7 +71,10 @@ QT += phonon4qt5 \endcode -QMake will take care of everything else. +QMake will take care of everything else. Except in certain situations QMake will +not be able to find the files necessary to enable a phonon4qt5 build, building +phono4qt5 with PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT, as explained above, +should prevent this from happening. \subsection phonon4qt5_using_cpp C++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/phonon/CMakeLists.txt new/phonon-4.7.0~git20131104/phonon/CMakeLists.txt --- old/phonon-4.6.80~git20130930/phonon/CMakeLists.txt 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/phonon/CMakeLists.txt 2013-11-04 12:30:32.000000000 +0100 @@ -134,6 +134,7 @@ endif (PHONON_NO_PLATFORMPLUGIN) add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins") +add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/") automoc4_add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS}) qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/phonon/factory.cpp new/phonon-4.7.0~git20131104/phonon/factory.cpp --- old/phonon-4.6.80~git20130930/phonon/factory.cpp 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/phonon/factory.cpp 2013-11-04 12:30:32.000000000 +0100 @@ -253,10 +253,17 @@ // could not load a backend through the platform plugin. Falling back to the default // (finding the first loadable backend). - const QLatin1String suffix("/phonon_backend/"); const QStringList paths = QCoreApplication::libraryPaths(); for (int i = 0; i < paths.count(); ++i) { - const QString libPath = paths.at(i) + suffix; +#ifdef __GNUC__ +#warning this actually breaks with qmake.... +#endif +#ifndef PHONON_BACKEND_DIR_SUFFIX +#ifdef __GNUC__ +#error PHONON_BACKEND_DIR_SUFFIX must be defined. +#endif +#endif + const QString libPath = paths.at(i) + PHONON_BACKEND_DIR_SUFFIX; const QDir dir(libPath); if (!dir.exists()) { pDebug() << Q_FUNC_INFO << dir.absolutePath() << "does not exist"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pdfchain for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package pdfchain for openSUSE:Factory checked in at 2013-11-04 15:43:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdfchain (Old) and /work/SRC/openSUSE:Factory/.pdfchain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pdfchain" Changes: -------- New Changes file: --- /dev/null 2013-10-11 12:16:15.204037506 +0200 +++ /work/SRC/openSUSE:Factory/.pdfchain.new/pdfchain.changes 2013-11-04 15:43:05.000000000 +0100 @@ -0,0 +1,109 @@ +------------------------------------------------------------------- +Thu Jul 11 2013 - joerg.lorenzen(a)ki.tng.de + Version 0.4.4 (alpha) + + * Depends no longer on gtkmm >= 3.6 (works with gtkmm >= 3.0) + * Added fallback for gtkmm < 3.6 (no MenuButton is used) + * Changed the configure.ac to define PDFCHAIN_GTKMM_OLD + at config.h in case of gtkmm < 3.6 + * Revised the FileChooser Dialogs and Buttons + * Added a clear function to all FileChoosers + * All FileChooser show the "current folder" not the "history" + * Changed the clear function for the FileChooser in the sections + Version 0.4.3 (alpha) + + * Revised Sections Background/Stamp and Burst + * Revised and added Tooltips + * Simpler user guidance + * Revised some tooltips + * Changed the signal handler for the check buttons in section Permissions + Version 0.4.2 (alpha) + + * Depends on PDFtk >= 2.0 + * Renamed Concatenate to Catenate + * Added and revised tooltips in sections Tools and Catenate + * Revised PDFtk return code messages + * Added PDFtk return codes 3 and 768 + * Added new features of PDFtk 2.0 in section Tools + * "Dump Data Annotaion" + * "Needs Appearances" + * Added "Repair document" in section Tools + * Replaced the expression "PDF file" by "document" + * Revised section permissions + * Revised tooltips + * Added user guidance (useless selections shouldn't be able) + * Revised the "create_command()" methode + * Added handlig and warning if user and owner password are the same +------------------------------------------------------------------- +Tue Jul 02 2013 - joerg.lorenzen(a)ki.tng.de + Version 0.4.1 (alpha) + + * Depends on gtkmm-3.0 >= 3.6.0 (for Gtk::MenuButton) + * Added a right click popup menu for the cat treeview + * Added move to top and move to bottom buttons to section cat + * Added some tooltips + * Moved the clear and about button into a menu with a menu button + * Moved the permissions from an expander to a toggle button + * Changed the order of the file filter at output folder file chooser burst + * Changed the stock icon at output folder file chooser burst + (Gtk::Stock::DIRECTORY doesn't work right) +------------------------------------------------------------------- +Wed Apr 03 2013 - joerg.lorenzen(a)ki.tng.de + Version 0.4.0 (alpha) + + * PDF Chain 0.4.0 is compatible with the PDF Toolkit 1.45 + and supporting its features. + PDF Chain 0.4.0 is not compatible with PDFtk 1.44 and older! + * Merged Cat Simple and Cat Extended to Conaticate + using the multi-character input handles of PDFtk 1.45. + By implementing the multi-character handles, + PDFtk removed its 26 file limitation. + Cat Simple is not necessary any longer. + * Using a guint id instead a char handle for indexing the files. + Default (not indexed) file id is G_MAXUINT. + * The method cLStore_CatExtended::createCommand() creates + a PDFtk input handle from the id. + Id 0 equals to handle A, 25 to Z, 26 to BA (multi-character) ... + * Adjust the command syntax for page rotation to PDFtk 1.45. + Using north, south, east, west now instead of N, S, E, W. + * Supporting the r page prefix of PDFtk 1.45. + * Rewrote some methodes at file id store_cat.cc + and reorganized some functionality of the liststore. + * Implemented the Clear Button. + * Removed the "Options" at the add-files-filechooser of Concatenate (Cat Extended). + * Add has its own column at Concatenate now. + * Changed some Labels ("Shuffle", "Digits", "UTF-8", ...) + * Updated projectpage (http://pdfchain.sourceforge.net/) +------------------------------------------------------------------- +Tue Oct 09 2012 - joerg.lorenzen(a)ki.tng.de + Version 0.3.5 (alpha) + + * Bugfix in section "Cat Extended" + (Bugreport: https://bugs.launchpad.net/ubuntu/+source/pdfchain/+bug/1048045) + Now re-indexing list-entries before creating the command + at metohod cLStore_CatExtended::createCommand() +------------------------------------------------------------------- +Sun Aug 26 2012 - joerg.lorenzen(a)ki.tng.de + Version 0.3.4 (alpha) + + * Added new section "Cat Simple" + * Changed GUI design + * Removed menubar (looks more like a dialog) + * Sections use full window width (looks more like gedit) + * Replaced progressbar by statusbar (status messages are not visible yet) + * Changed some strings + * Renamed section "Concatenate" to "Cat Extended" + * Renamed "Features" to "Allow" (like at pdftk) + * some other strings ... + * Implementing code for "Attach to page" (missing since v.0.3.1) + * Fixed behavior of "Add files" at section "Cat Extended" + * Rewrote filechoosers and filechooserbuttons + * Rewrote combobox "pdf id" at cat sections + * Configured autoconf by hand + * Rewrote project homepage: http://pdfchain.sourceforge.net + * Created Git repository at sourceforge project page: + git://pdfchain.git.sourceforge.net/gitroot/pdfchain/pdfchain + * Created new application logo and set of icons +------------------------------------------------------------------- +Wed Jan 18 2012 - joerg.lorenzen(a)ki.tng.de +- Initial package, version 0.3.3 New: ---- pdfchain-0.4.4.tar.gz pdfchain-desktop.patch pdfchain.changes pdfchain.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdfchain.spec ++++++ # # spec file for package pdfchain # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012-2013 B1 Systems GmbH, Vohburg, 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/ # Name: pdfchain Summary: A GUI for pdftk Version: 0.4.4 Release: 1 URL: http://sourceforge.net/projects/pdfchain/ Source0: pdfchain-%{version}.tar.gz Patch0: pdfchain-desktop.patch License: GPL-3.0 Group: Productivity/Publishing/PDF Requires: pdftk >= 1.45 BuildRequires: gtkmm3-devel BuildRequires: gcc-c++ BuildRequires: intltool >= 0.35.0 BuildRequires: update-desktop-files BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build %description PDF Chain is a Graphical User Interface for the PDF Tool Kit. It includes features designed to handle PDF files in a easy way. Basicaly it can merge, split, add backgrounds or stamps and add attachments. There are some tools for extended needs, too. The GUI is written using GTKmm, a C++ library for GTK. PDF Chain is released under the terms of the GNU Public License verion 3. PDF Chain comes without any warranty. %prep %setup -q %patch0 %build %configure %__make %{?jobs:-j %jobs} %install %makeinstall rm -rf %{buildroot}%{_datadir}/doc/pdfchain %fdupes %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/pdfchain %{_datadir}/applications/pdfchain.desktop %{_datadir}/icons/hicolor/*/apps/pdfchain.png %{_datadir}/pixmaps/pdfchain.png %doc AUTHORS ChangeLog COPYING README %changelog ++++++ pdfchain-desktop.patch ++++++ --- application/pdfchain.desktop.orig 2013-07-02 22:57:38.846243372 +0200 +++ application/pdfchain.desktop 2013-07-02 22:57:38.861243086 +0200 @@ -1,17 +1,14 @@ [Desktop Entry] -Encoding=UTF-8 Name=PDF Chain -GenericName=pdfchain -Comment=A graphical user interface for the PDF Toolkit (PDFtk) +GenericName=GUI for the PDF Tool Kit +GenericName[de]=GUI für das PDF Tool Kit +Comment=A graphical tool for manipulating PDF documents +Comment[de]=Ein grafisches Werkzeug zur Manipulation von PDF Dokumenten Exec=pdfchain Icon=pdfchain Type=Application -StartupNotify=false -Categories=Office; +Categories=Office;Viewer; MimeType=application/pdf; Terminal=false -Comment[de]=Eine grafische Benutzerschnittstelle für das PDF Toolkit (PDFtk) -#Comment[en]= -Comment[es]=Interfaz del usuario grafica para el PDF Toolkit (PDFtk) -#Comment[fr]= -Comment[it]=Interfaccia utente grafica per il PDF Toolkit (PDFtk) +X-KDE-StartupNotify=true +X-SuSE-translate=true -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvas-manager for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package openvas-manager for openSUSE:Factory checked in at 2013-11-04 15:42:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvas-manager (Old) and /work/SRC/openSUSE:Factory/.openvas-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvas-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/openvas-manager/openvas-manager.changes 2013-09-17 16:25:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvas-manager.new/openvas-manager.changes 2013-11-04 15:42:28.000000000 +0100 @@ -1,0 +2,25 @@ +Fri Oct 25 13:02:13 UTC 2013 - johann.luce(a)wanadoo.fr + +- Update in 4.0.3 + * Bugfix for DB-Migration from v55 to v56 for port lists. + * In GET_REPORT_FORMATS send TRUST and ACTIVE in details case too. Details cases + should always include everything from the simple case. + * In case of problems with SCAP or CERT database, Manager will still start up. + * Delete orphaned results and clear report counts cache if needed. This + could significantly reduce size of the database. + * Delete results of report from results table always upon deleting a report. + * Overrides XML: Output threat element not only when details flag is set. + * Make Manager more robust on absent Scanner when deleting a task. + * Add timezone element for schedules. + * Bug fixes for numerical sorting (CVSS values). + * Bug fix for LSC credentials that had whitesapces in their name. + * Bugfix for database backup to consider all of the journal files. + * Add log for successful creation in CREATE_NOTE and CREATE_OVERRIDE. + * Update NBE report format plugin to improve compatibility with third + party tools. + * For creation of Credentials. encrypt the random password and not the + unrelated given_password. + * Performance improvements. + * Various little bugfixes. + +------------------------------------------------------------------- Old: ---- openvas-manager-4.0.2.tar.gz New: ---- openvas-manager-4.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-manager.spec ++++++ --- /var/tmp/diff_new_pack.GTBB0Z/_old 2013-11-04 15:42:29.000000000 +0100 +++ /var/tmp/diff_new_pack.GTBB0Z/_new 2013-11-04 15:42:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: openvas-manager -Version: 4.0.2 +Version: 4.0.3 Release: 5.1 Url: http://www.openvas.org Source0: %{name}-%{version}.tar.gz ++++++ openvas-manager-4.0.2.tar.gz -> openvas-manager-4.0.3.tar.gz ++++++ ++++ 5063 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvas-administrator for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package openvas-administrator for openSUSE:Factory checked in at 2013-11-04 15:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvas-administrator (Old) and /work/SRC/openSUSE:Factory/.openvas-administrator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvas-administrator" Changes: -------- --- /work/SRC/openSUSE:Factory/openvas-administrator/openvas-administrator.changes 2013-09-17 16:27:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvas-administrator.new/openvas-administrator.changes 2013-11-04 15:42:05.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Oct 25 13:09:00 UTC 2013 - johann.luce(a)wanadoo.fr + +- Update in 1.3.1 + * Change short name for "--sync-script" back to "-s" to restore established + behaviour. + * Change short name for "--scap-script" from "-s" to "-A". + * Minor cleanups and build improvements. + +------------------------------------------------------------------- Old: ---- openvas-administrator-1.3.0.tar.gz New: ---- openvas-administrator-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-administrator.spec ++++++ --- /var/tmp/diff_new_pack.kLfrSB/_old 2013-11-04 15:42:28.000000000 +0100 +++ /var/tmp/diff_new_pack.kLfrSB/_new 2013-11-04 15:42:28.000000000 +0100 @@ -18,7 +18,7 @@ Name: openvas-administrator -Version: 1.3.0 +Version: 1.3.1 Release: 2.2 License: GPL-2.0+ Group: Productivity/Networking/Security ++++++ openvas-administrator-1.3.0.tar.gz -> openvas-administrator-1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/CHANGES new/openvas-administrator-1.3.1/CHANGES --- old/openvas-administrator-1.3.0/CHANGES 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/CHANGES 2013-10-25 08:44:26.000000000 +0200 @@ -1,3 +1,21 @@ +openvas-administrator 1.3.1 (2013-10-25) + +This is the first maintenance release of the OpenVAS Administrator 1.3, the +local and remote administrative tool for the Open Vulnerability Assessment +System release 6 (OpenVAS-6). + +The release fixes command line parameter names for convenience. + +Many thanks to everyone who has contributed to this release: +Matthew Mundell, Michael Wiegand and Jan-Oliver Wagner. + +Main changes since 1.3.0: +* Change short name for "--sync-script" back to "-s" to restore established + behaviour. +* Change short name for "--scap-script" from "-s" to "-A". +* Minor cleanups and build improvements. + + openvas-administrator 1.3.0 (2013-04-15) This is the first release of the OpenVAS Administrator 1.3, the local and remote diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/CMakeLists.txt new/openvas-administrator-1.3.1/CMakeLists.txt --- old/openvas-administrator-1.3.0/CMakeLists.txt 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/CMakeLists.txt 2013-10-20 19:47:13.000000000 +0200 @@ -7,7 +7,7 @@ # Michael Wiegand <michael.wiegand(a)greenbone.net> # # Copyright: -# Copyright (C) 2009, 2010 Greenbone Networks GmbH +# Copyright (C) 2009-2013 Greenbone Networks GmbH # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, @@ -78,7 +78,7 @@ set (CPACK_TOPLEVEL_TAG "") set (CPACK_PACKAGE_VERSION_MAJOR "1") set (CPACK_PACKAGE_VERSION_MINOR "3") -set (CPACK_PACKAGE_VERSION_PATCH "0${SVN_REVISION}") +set (CPACK_PACKAGE_VERSION_PATCH "1${SVN_REVISION}") set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") # Use this scheme for +betaN and +rcN releases: #set (CPACK_PACKAGE_VERSION_PATCH "+beta1${SVN_REVISION}") @@ -168,7 +168,7 @@ ## ## TODO Also check for headers where needed. -pkg_check_modules (LIBOPENVAS REQUIRED libopenvas>=6.0.0) +pkg_check_modules (LIBOPENVAS REQUIRED libopenvas>=6.0.0 libopenvas<=6.9.0) pkg_check_modules (GNUTLS REQUIRED gnutls>=2.8) pkg_check_modules (GLIB REQUIRED glib-2.0>=2.16) pkg_check_modules (UUID REQUIRED uuid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/ChangeLog new/openvas-administrator-1.3.1/ChangeLog --- old/openvas-administrator-1.3.0/ChangeLog 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/ChangeLog 2013-10-25 08:45:54.000000000 +0200 @@ -1,3 +1,43 @@ +2013-10-25 Jan-Oliver Wagner <jan-oliver.wagner(a)greenbone.net> + + Preparing for the 1.3.1 release. + + * CHANGES: Updated. + +2013-07-24 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * INSTALL: Reorder PKG_CONFIG_PATH export, in case another openvas + installation is already in existing PKG_CONFIG_PATH. + +2013-05-15 Jan-Oliver Wagner <jan-oliver.wagner(a)greenbone.net> + + * CMakeLists.txt: Make exactly release 6 of openvas-libraries + a requirement. Newer version are incompatible because + administrator is deprecated from OpenVAS-7 on. + + * INSTALL: Added standard way for out-of-source build. + +2013-05-07 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * src/openvasad.c (main): Add @todo regarding variable and parameter + names now that there a multiple synchronization scripts. + +2013-03-06 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * README: Remove reference to tests. + +2013-04-17 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * src/openvasad.c (main): Change short name for "--sync-script" back + to "-s" to restore established behaviour. Change short name for + "--scap-script" from "-s" to "-A". + +2013-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Post release version bump. + + * CMakeLists.txt: Updated version number to 1.3.1. + 2013-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> Preparing for the 1.3.0 release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/INSTALL new/openvas-administrator-1.3.1/INSTALL --- old/openvas-administrator-1.3.0/INSTALL 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/INSTALL 2013-10-20 19:47:13.000000000 +0200 @@ -10,7 +10,7 @@ --------------------------------------- Prerequisites: -* openvas-libraries >= 6.0.0 +* openvas-libraries >= 6.0.0, <7.0.0 * gnutls >= 2.8 * cmake >= 2.6.0 * glib-2.0 >= 2.16 @@ -30,15 +30,20 @@ set the PKG_CONFIG_PATH environment variable to the location of you pkg-config files before configuring: - $ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/your/location/lib/pkgconfig + $ export PKG_CONFIG_PATH=/your/location/lib/pkgconfig:$PKG_CONFIG_PATH + +Create a build directory and change into it with + + $ mkdir build + $ cd build Then configure the build with - $ cmake -DCMAKE_INSTALL_PREFIX=/path/to/your/installation . + $ cmake -DCMAKE_INSTALL_PREFIX=/path/to/your/installation .. or (if you want to use the default installation path /usr/local) - $ cmake . + $ cmake .. This only needs to be done once. Note: It is assumed that the other OpenVAS components are installed to the same path. If not, you need to set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/README new/openvas-administrator-1.3.1/README --- old/openvas-administrator-1.3.0/README 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/README 2013-10-20 19:47:13.000000000 +0200 @@ -42,30 +42,3 @@ OpenVAS developers through the OpenVAS mailing list or the online chat or submitting bug reports at http://bugs.openvas.org/ as it may help to pinpoint the source of your issue. - - -Testing -------- - -There are some tests under src/tests. To run them, start your openvasad, -for example with - - openvasad --port 9999 - -then set the environment variables for the user and password - - export OPENVAS_TEST_USER=user_created_by_openvas-adduser - export OPENVAS_TEST_PASSWORD=that_user's_password - -and optionally for the host and/or port - - export OPENVAS_TEST_HOST=host.example.org - export OPENVAS_TEST_PORT=9999 - -and then run all the tests - - make test - -or any one of the tests, for example - - src/tests/oap_help_0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-administrator-1.3.0/src/openvasad.c new/openvas-administrator-1.3.1/src/openvasad.c --- old/openvas-administrator-1.3.0/src/openvasad.c 2013-04-15 11:37:44.000000000 +0200 +++ new/openvas-administrator-1.3.1/src/openvasad.c 2013-10-20 19:47:13.000000000 +0200 @@ -449,6 +449,10 @@ * e.g. g_warnings on EXIT_FAILURE, a separate log handler for console mode * and so on. * + * @todo sync_script should be called nvt_script for consistency now that + * there is more than one synchronization script. Other command line parameters + * and variable should be changed to reflect this as well. + * * @return EXIT_SUCCESS if execution of the requested action was successful, * EXIT_FAILURE if not. */ @@ -522,10 +526,10 @@ OPENVAS_CONFIG_FILE ")", "<config-file>"}, #endif /* S_SPLINT_S */ - {"sync-script", 0, 0, G_OPTION_ARG_FILENAME, &sync_script, + {"sync-script", 's', 0, G_OPTION_ARG_FILENAME, &sync_script, "Script to use for NVT feed synchronization", "<sync-script>"}, - {"scap-script", 's', 0, G_OPTION_ARG_FILENAME, &scap_script, + {"scap-script", 'A', 0, G_OPTION_ARG_FILENAME, &scap_script, "Script to use for SCAP feed synchronization", "<scap-script>"}, {"cert-script", 'C', 0, G_OPTION_ARG_FILENAME, &cert_script, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-recompress for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package obs-service-recompress for openSUSE:Factory checked in at 2013-11-04 15:40:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-recompress (Old) and /work/SRC/openSUSE:Factory/.obs-service-recompress.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-recompress" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-recompress/obs-service-recompress.changes 2013-10-30 15:47:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-recompress.new/obs-service-recompress.changes 2013-11-04 15:40:04.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 4 09:13:15 UTC 2013 - speilicke(a)suse.com + +- Update to version 0.3: + + Don't overwrite identical files + +------------------------------------------------------------------- Old: ---- obs-service-recompress-0.2.tar.gz New: ---- obs-service-recompress-0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-recompress.spec ++++++ --- /var/tmp/diff_new_pack.914EEm/_old 2013-11-04 15:40:06.000000000 +0100 +++ /var/tmp/diff_new_pack.914EEm/_new 2013-11-04 15:40:06.000000000 +0100 @@ -19,7 +19,7 @@ %define service recompress Name: obs-service-%{service} -Version: 0.2 +Version: 0.3 Release: 0 Summary: An OBS source service: Recompress files License: GPL-2.0+ ++++++ obs-service-recompress-0.2.tar.gz -> obs-service-recompress-0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-recompress-0.2/recompress new/obs-service-recompress-0.3/recompress --- old/obs-service-recompress-0.2/recompress 2013-10-29 14:50:47.000000000 +0100 +++ new/obs-service-recompress-0.3/recompress 2013-11-04 10:12:59.000000000 +0100 @@ -90,7 +90,29 @@ # do the real work $UNCOMPRESS "$FILE" | $COMPRESS > "$MYOUTDIR/$NEWFILE" || exit 1 - echo "Compressed $FILE to $NEWFILE" + + # Check if the (compressed) target file already exists in the directory where + # the service is invoked and drop the newly generated one. Avoids overwriting + # otherwise identical files which only have different timestamps. Note that + # zdiff and co all fail to do that properly... + if [ -f $NEWFILE ] ; then + DIFF_TMPDIR=$(mktemp -d) + SRC_DIR="$PWD" + cd $DIFF_TMPDIR + mkdir new old + $(cd new ; tar -xxf "$MYOUTDIR/$NEWFILE") + $(cd old ; tar -xxf "$SRC_DIR/$NEWFILE") + if diff -r new old > /dev/null ; then + echo "Identical target file $NEWFILE already exists, skipping.." + rm -r "$MYOUTDIR/$NEWFILE" + else + echo "Compressed $FILE to $NEWFILE" + fi + cd $SRC_DIR + rm -r $DIFF_TMPDIR + else + echo "Compressed $FILE to $NEWFILE" + fi # we can remove service files, no need to store them twice rm -f "$FILE" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozc for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2013-11-04 15:38:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2013-09-02 15:00:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-11-04 15:38:07.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Oct 28 17:53:17 UTC 2013 - ftake(a)geeko.jp + +- Fix typed password is shown on GNOME lock screen bnc#847718 + * Add support-input-purpose.patch +- Fix config button is disabled on GNOME Control Center rh#904625 +- Change initial input mode of ibus-mozc to direct input Issue#201 + * Add fix-initial-input-mode.patch +- Enables keyboard layout variations for ibus-mozc + * Add ibus-provide-layout-variations.patch + * Supplements the fix above + +------------------------------------------------------------------- New: ---- fix-initial-input-mode.patch ibus-provide-layout-variations.patch ibus-setup-mozc-jp.desktop.in support-input-purpose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.ncb3f0/_old 2013-11-04 15:38:09.000000000 +0100 +++ /var/tmp/diff_new_pack.ncb3f0/_new 2013-11-04 15:38:09.000000000 +0100 @@ -40,19 +40,27 @@ Source0: %{name}-%{version}.tar.bz2 Source1: README.SUSE Source2: fcitx-mozc-icons.tar.gz -%if %{with_fcitx} -# PATCH-FEATURE-UPSTREAM i(a)marguerite.su - add fcitx as mozc module -Patch0: fcitx-mozc-1.11.1522.102.1.patch -%endif # gyp is not included from 1.11.1522.102 # License: BSD-3-Clause # svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp Source3: gyp-r1665.tar.bz2 +Source4: ibus-setup-mozc-jp.desktop.in +%if %{with_fcitx} +# PATCH-FEATURE-UPSTREAM i(a)marguerite.su - add fcitx as mozc module +Patch0: fcitx-mozc-1.11.1522.102.1.patch +%endif +# PATCH-FIX-UPSTREAM ftake(a)geeko.jp bnc#847718 +Patch1: support-input-purpose.patch +# PATCH-FIX-UPSTREAM ftake(a)geeko.jp +Patch2: fix-initial-input-mode.patch +# PATCH-FEATURE-OPENSUSE ftake(a)geeko.jp +Patch3: ibus-provide-layout-variations.patch BuildRequires: libopenssl-devel BuildRequires: pkgconfig BuildRequires: protobuf-devel BuildRequires: python +BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -119,6 +127,10 @@ %patch0 -p2 %endif +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 + cp %{SOURCE1} . # extract gyp @@ -126,6 +138,8 @@ tar xvf %{SOURCE3} popd +sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop + %build %define target Release export QTDIR=%{_libdir}/qt4 @@ -169,6 +183,18 @@ install -m644 data/images/unix/ui-alpha_half.png %{buildroot}%{_datadir}/ibus-mozc/alpha_half.png install -m644 data/images/unix/ui-alpha_full.png %{buildroot}%{_datadir}/ibus-mozc/alpha_full.png +install -m755 -d %{buildroot}%{_datadir}/applications +install -m644 ibus-setup-mozc-jp.desktop %{buildroot}%{_datadir}/applications/ibus-setup-mozc-jp.desktop +%suse_update_desktop_file ibus-setup-mozc-jp System Utility settings + +# for provide-layout-variations patch +ln -s ibus-setup-mozc-jp.desktop %{buildroot}%{_datadir}/applications/ibus-setup-mozc-jp-jp.desktop +%suse_update_desktop_file ibus-setup-mozc-jp-jp System Utility settings +ln -s ibus-setup-mozc-jp.desktop %{buildroot}%{_datadir}/applications/ibus-setup-mozc-us.desktop +%suse_update_desktop_file ibus-setup-mozc-us System Utility settings +ln -s ibus-setup-mozc-jp.desktop %{buildroot}%{_datadir}/applications/ibus-setup-mozc-dv.desktop +%suse_update_desktop_file ibus-setup-mozc-dv System Utility settings + %if %{with_fcitx} # Install Fcitx module for mofile in out_linux/Release/obj/gen/unix/fcitx/po/*.mo @@ -240,6 +266,10 @@ %defattr(-, root, root) %dir %{_libdir}/ibus-mozc/ %{_libdir}/ibus-mozc/ibus-engine-mozc +%{_datadir}/applications/ibus-setup-mozc-jp.desktop +%{_datadir}/applications/ibus-setup-mozc-jp-jp.desktop +%{_datadir}/applications/ibus-setup-mozc-us.desktop +%{_datadir}/applications/ibus-setup-mozc-dv.desktop %dir %{_datadir}/ibus/component/ %{_datadir}/ibus/component/mozc.xml %dir %{_datadir}/ibus-mozc/ ++++++ fix-initial-input-mode.patch ++++++ diff -ru unix.org/ibus/property_handler.cc unix/ibus/property_handler.cc --- unix.org/ibus/property_handler.cc 2013-10-29 02:17:24.898870371 +0900 +++ unix/ibus/property_handler.cc 2013-10-29 02:48:55.617344149 +0900 @@ -84,8 +84,27 @@ client_(client), translator_(translator), original_composition_mode_(kMozcEngineInitialCompositionMode), +#if IBUS_CHECK_VERSION(1, 5, 0) + is_activated_(false), +#else is_activated_(true), +#endif is_disabled_(false) { + commands::KeyEvent key; + if (is_activated_) { + key.set_special_key(mozc::commands::KeyEvent::ON); + } else { + key.set_special_key(mozc::commands::KeyEvent::OFF); + } + key.set_activated(is_activated_); + key.set_mode(original_composition_mode_); + commands::Output output; + if (client_->SendKey(key, &output)) { + original_composition_mode_ = output.status().mode(); + is_activated_ = output.status().activated(); + } else { + LOG(ERROR) << "SendKey failed"; + } AppendCompositionPropertyToPanel(); #ifndef OS_CHROMEOS @@ -133,6 +152,9 @@ IBusPropList *sub_prop_list = ibus_prop_list_new(); // Create items for the radio menu. + const commands::CompositionMode initial_mode = is_activated_ ? + original_composition_mode_ : + kMozcEnginePropertyIMEOffState->composition_mode; string icon_path_for_panel; const char *mode_symbol = NULL; for (size_t i = 0; i < kMozcEnginePropertiesSize; ++i) { @@ -140,7 +162,7 @@ IBusText *label = ibus_text_new_from_string( translator_->MaybeTranslate(entry.label).c_str()); IBusPropState state = PROP_STATE_UNCHECKED; - if (entry.composition_mode == kMozcEngineInitialCompositionMode) { + if (entry.composition_mode == initial_mode) { state = PROP_STATE_CHECKED; icon_path_for_panel = GetIconPath(entry.icon); mode_symbol = entry.label_for_panel; Only in unix/ibus: property_handler.cc.orig ++++++ ibus-provide-layout-variations.patch ++++++ diff -ru unix.org/ibus/gen_mozc_xml.py unix/ibus/gen_mozc_xml.py --- unix.org/ibus/gen_mozc_xml.py 2013-11-01 02:33:37.673242963 +0900 +++ unix/ibus/gen_mozc_xml.py 2013-11-01 02:35:46.918429452 +0900 @@ -69,7 +69,6 @@ 'description': '%(product_name)s (Japanese Input Method)', 'language': 'ja', 'icon': '%(ibus_mozc_icon_path)s', - 'rank': '80', 'symbol': 'あ', } @@ -86,12 +85,17 @@ }, # On Linux (IBus >= 1.5), we use special label 'default' for the keyboard # layout. + # openSUSE provides four engines like ChromeOS 'Linux-IBus1.5': { # DO NOT change the engine name 'mozc-jp'. The names is referenced by # unix/ibus/mozc_engine.cc. - 'name': ['mozc-jp'], - 'longname': ['%(product_name)s'], - 'layout': ['default'], + 'name': ['mozc-jp', 'mozc-jp-jp', 'mozc-us', 'mozc-dv'], + 'longname': ['%(product_name)s', + '%(product_name)s - JP layout', + '%(product_name)s - US layout', + '%(product_name)s - US Dvorak layout'], + 'layout': ['default', 'jp', 'us', 'us(dvorak)'], + 'rank': ['80', '0', '0', '0'], }, # On Chrome/Chromium OS, we provide three engines. 'ChromeOS': { ++++++ ibus-setup-mozc-jp.desktop.in ++++++ [Desktop Entry] Name=IBus Mozc Setup Comment=Set up IBus Mozc engine Exec=@libdir@/mozc/mozc_tool --mode=config_dialog Icon=/usr/share/ibus-mozc/product_icon.png NoDisplay=true Type=Application StartupNotify=true ++++++ support-input-purpose.patch ++++++ Index: engine_interface.h =================================================================== --- unix/ibus/engine_interface.h (revision 177) +++ unix/ibus/engine_interface.h (working copy) @@ -106,6 +106,11 @@ gint y, gint w, gint h) = 0; + + // The interface function for the "set-content-type" signal + virtual void SetContentType(IBusEngine *engine, + guint purpose, + guint hints) = 0; }; } // namespace ibus Index: engine_registrar.cc =================================================================== --- unix/ibus/engine_registrar.cc (revision 177) +++ unix/ibus/engine_registrar.cc (working copy) @@ -63,7 +63,9 @@ engine_class->reset = Reset; engine_class->set_capabilities = SetCapabilities; engine_class->set_cursor_location = SetCursorLocation; - +#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) + engine_class->set_content_type = SetContentType; +#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE return true; } @@ -87,6 +89,9 @@ engine_class->reset = NULL; engine_class->set_capabilities = NULL; engine_class->set_cursor_location = NULL; +#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) + engine_class->set_content_type = NULL; +#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE mozc::ibus::EngineInterface *previous = g_engine; g_engine = NULL; @@ -179,5 +184,12 @@ g_engine->SetCursorLocation(engine, x, y, w, h); } +void EngineRegistrar::SetContentType( + IBusEngine *engine, + guint purpose, + guint hints) { + g_engine->SetContentType(engine, purpose, hints); +} + } // namespace ibus } // namespace mozc Index: engine_registrar.h =================================================================== --- unix/ibus/engine_registrar.h (revision 177) +++ unix/ibus/engine_registrar.h (working copy) @@ -84,6 +84,9 @@ gint y, gint w, gint h); + static void SetContentType(IBusEngine *engine, + guint purpose, + guint hints); }; } // namespace ibus Index: ibus_header.h =================================================================== --- unix/ibus/ibus_header.h (revision 177) +++ unix/ibus/ibus_header.h (working copy) @@ -36,5 +36,10 @@ #error "ibus-mozc now requires IBus>=1.4.1" #endif // libibus (<1.4.1) +#if IBUS_CHECK_VERSION(1, 5, 4) +#if !defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) +#define MOZC_ENABLE_IBUS_INPUT_PURPOSE +#endif // !MOZC_ENABLE_IBUS_INPUT_PURPOSE +#endif // libibus(>=1.5.4) #endif // MOZC_UNIX_IBUS_IBUS_HEADER_H_ Index: mozc_engine.cc =================================================================== --- unix/ibus/mozc_engine.cc (revision 177) +++ unix/ibus/mozc_engine.cc (working copy) @@ -372,6 +372,7 @@ void MozcEngine::FocusOut(IBusEngine *engine) { GetCandidateWindowHandler(engine)->Hide(engine); + property_handler_->ResetContentType(engine); // Do not call SubmitSession or RevertSession. Preedit string will commit on // Focus Out event automatically by ibus_engine_update_preedit_text_with_mode @@ -397,6 +398,11 @@ VLOG(2) << "keyval: " << keyval << ", keycode: " << keycode << ", modifiers: " << modifiers; + if (property_handler_->IsDisabled()) { + // It is each enginze's responsibility for ignoreing keyevents on + // the password field on the locked screen since IBus 1.5.4. + return FALSE; + } // Send current caret location to mozc_server to manage suggest window // position. @@ -501,6 +507,18 @@ // Do nothing } +void MozcEngine::SetContentType(IBusEngine *engine, + guint purpose, + guint hints) { + const bool prev_disabled = + property_handler_->IsDisabled(); + property_handler_->UpdateContentType(engine); + if (!prev_disabled && property_handler_->IsDisabled()) { + // Make sure on-going composition is reverted. + RevertSession(engine); + } +} + GType MozcEngine::GetType() { static GType type = 0; Index: mozc_engine.h =================================================================== --- unix/ibus/mozc_engine.h (revision 177) +++ unix/ibus/mozc_engine.h (working copy) @@ -99,6 +99,9 @@ gint y, gint w, gint h); + void SetContentType(IBusEngine *engine, + guint purpose, + guint hints); // Returns the GType which this class represents. static GType GetType(); Index: property_handler.cc =================================================================== --- unix/ibus/property_handler.cc (revision 177) +++ unix/ibus/property_handler.cc (working copy) @@ -61,6 +61,19 @@ bool IsMozcToolAvailable() { return FileUtil::FileExists(SystemUtil::GetToolPath()); } + +bool GetDisabled(IBusEngine *engine) { + bool disabled = false; +#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) + guint purpose = IBUS_INPUT_PURPOSE_FREE_FORM; + guint hints = IBUS_INPUT_HINT_NONE; + ibus_engine_get_content_type(engine, &purpose, &hints); + disabled = (purpose == IBUS_INPUT_PURPOSE_PASSWORD || + purpose == IBUS_INPUT_PURPOSE_PIN); +#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE + return disabled; +} + } // namespace PropertyHandler::PropertyHandler(MessageTranslatorInterface *translator, @@ -71,7 +84,8 @@ client_(client), translator_(translator), original_composition_mode_(kMozcEngineInitialCompositionMode), - is_activated_(true) { + is_activated_(true), + is_disabled_(false) { AppendCompositionPropertyToPanel(); #ifndef OS_CHROMEOS @@ -105,6 +119,7 @@ void PropertyHandler::Register(IBusEngine *engine) { ibus_engine_register_properties(engine, prop_root_); + UpdateContentType(engine); } // TODO(nona): do not use kMozcEngine*** directory. @@ -228,8 +243,34 @@ ibus_prop_list_append(prop_root_, prop_mozc_tool_); } +void PropertyHandler::UpdateContentTypeImpl(IBusEngine *engine, + bool disabled) { + const bool prev_is_disabled = is_disabled_; + is_disabled_ = disabled; + if (prev_is_disabled == is_disabled_) { + return; + } + const auto visible_mode = + (prev_is_disabled && !is_disabled_ && IsActivated()) + ? original_composition_mode_ : + kMozcEnginePropertyIMEOffState->composition_mode; + UpdateCompositionModeIcon(engine, visible_mode); +} + +void PropertyHandler::ResetContentType(IBusEngine *engine) { + UpdateContentTypeImpl(engine, false); +} + +void PropertyHandler::UpdateContentType(IBusEngine *engine) { + UpdateContentTypeImpl(engine, GetDisabled(engine)); +} + void PropertyHandler::Update(IBusEngine *engine, const commands::Output &output) { + if (IsDisabled()) { + return; + } + if (output.has_status() && (output.status().activated() != is_activated_ || output.status().mode() != original_composition_mode_)) { @@ -325,6 +366,10 @@ const gchar *property_name, guint property_state) { #ifndef OS_CHROMEOS + if (IsDisabled()) { + return; + } + if (prop_mozc_tool_) { for (guint prop_index = 0; ; ++prop_index) { IBusProperty *prop = ibus_prop_list_get( @@ -371,9 +416,13 @@ } bool PropertyHandler::IsActivated() const { - return is_activated_; + return is_activated_ && !IsDisabled(); } +bool PropertyHandler::IsDisabled() const { + return is_disabled_; +} + commands::CompositionMode PropertyHandler::GetOriginalCompositionMode() const { return original_composition_mode_; } Index: property_handler.h =================================================================== --- unix/ibus/property_handler.h (revision 177) +++ unix/ibus/property_handler.h (working copy) @@ -54,14 +54,19 @@ virtual ~PropertyHandler(); virtual void Register(IBusEngine *engine); + virtual void ResetContentType(IBusEngine *engine); + virtual void UpdateContentType(IBusEngine *engine); virtual void Update(IBusEngine *engine, const commands::Output &output); virtual void ProcessPropertyActivate(IBusEngine *engine, const gchar *property_name, guint property_state); virtual bool IsActivated() const; + virtual bool IsDisabled() const; virtual commands::CompositionMode GetOriginalCompositionMode() const; private: + void UpdateContentTypeImpl(IBusEngine *engine, bool disabled); + // Appends composition properties into panel void AppendCompositionPropertyToPanel(); // Appends tool properties into panel @@ -79,6 +84,7 @@ scoped_ptr<MessageTranslatorInterface> translator_; commands::CompositionMode original_composition_mode_; bool is_activated_; + bool is_disabled_; }; } // namespace ibus Index: property_handler_interface.h =================================================================== --- unix/ibus/property_handler_interface.h (revision 177) +++ unix/ibus/property_handler_interface.h (working copy) @@ -45,6 +45,9 @@ // Registers current properties into engine. virtual void Register(IBusEngine *engine) ABSTRACT; + virtual void ResetContentType(IBusEngine *engine) ABSTRACT; + virtual void UpdateContentType(IBusEngine *engine) ABSTRACT; + // Update properties. virtual void Update(IBusEngine *engine, const commands::Output &output) ABSTRACT; @@ -55,6 +58,9 @@ // Returns if IME is activated or not. virtual bool IsActivated() const ABSTRACT; + // Returns if IME is forcesully disabled, e.g. on a password field. + virtual bool IsDisabled() const ABSTRACT; + // Returns original composition mode before. virtual commands::CompositionMode GetOriginalCompositionMode() const ABSTRACT; }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluedevil for openSUSE:13.1
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package bluedevil for openSUSE:13.1 checked in at 2013-11-04 15:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/bluedevil (Old) and /work/SRC/openSUSE:13.1/.bluedevil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluedevil" Changes: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluedevil.spec ++++++ --- /var/tmp/diff_new_pack.9Lv8Mj/_old 2013-11-04 15:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.9Lv8Mj/_new 2013-11-04 15:34:45.000000000 +0100 @@ -39,17 +39,12 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -%if %suse_version > 1230 -Requires: obexd-server -Requires: openobex -%else Requires: obex-data-server %if %suse_version > 1130 Requires: obexd-client %else Requires: obexd %endif -%endif %if %with_lang Recommends: %{name}-lang = %{version} %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Test-DVD-x86_64 for openSUSE:Factory
by root＠hilbert.suse.de 04 Nov '13

04 Nov '13

Hello community, here is the log from the commit of package Test-DVD-x86_64 for openSUSE:Factory checked in at 2013-11-04 15:28:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Test-DVD-x86_64 (Old) and /work/SRC/openSUSE:Factory/.Test-DVD-x86_64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Test-DVD-x86_64" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PRODUCT-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.QpC7fp/_old 2013-11-04 15:28:13.000000000 +0100 +++ /var/tmp/diff_new_pack.QpC7fp/_new 2013-11-04 15:28:13.000000000 +0100 @@ -436,7 +436,6 @@ <repopackage name="patterns-openSUSE-enhanced_base"/> <repopackage name="patterns-openSUSE-fonts"/> <repopackage name="patterns-openSUSE-sw_management"/> - <repopackage name="patterns-openSUSE-update_test"/> <repopackage name="patterns-openSUSE-x11"/> <repopackage name="patterns-openSUSE-x11_yast"/> <repopackage name="pciutils"/> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0