November 2013 - openSUSE Commits - openSUSE Mailing Lists

commit dateutils 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 dateutils for openSUSE:Factory checked in at 2013-11-04 12:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dateutils (Old) and /work/SRC/openSUSE:Factory/.dateutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dateutils" Changes: -------- --- /work/SRC/openSUSE:Factory/dateutils/dateutils.changes 2013-07-30 16:13:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dateutils.new/dateutils.changes 2013-11-04 12:46:08.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Oct 29 16:45:20 UTC 2013 - sweet_f_a(a)gmx.de + +- bump version 0.2.6, this is a bug fix release. + * issue 19, -q|--quiet no longer sends some commands into an + inf-loop + * netbsd test failures are fixed (due to missing leap seconds) + * AIX builds are supported (getopt_long() is part of the code + now) + * internally the test harness is migrated to the cli-testing tool + this fixes an issue when tests are run in directories with odd + names (spaces, dollar signs, etc. in the path name) + * See info page examples and/or README. + +------------------------------------------------------------------- Old: ---- dateutils-0.2.5.tar.xz New: ---- dateutils-0.2.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dateutils.spec ++++++ --- /var/tmp/diff_new_pack.vjGTyH/_old 2013-11-04 12:46:08.000000000 +0100 +++ /var/tmp/diff_new_pack.vjGTyH/_new 2013-11-04 12:46:08.000000000 +0100 @@ -16,10 +16,10 @@ # -%define xversion 0.2.5 +%define xversion 0.2.6 Name: dateutils -Version: 0.2.5 +Version: 0.2.6 Release: 0 Summary: Nifty command line date and time utilities License: BSD-3-Clause ++++++ dateutils-0.2.5.tar.xz -> dateutils-0.2.6.tar.xz ++++++ ++++ 62058 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 converseen 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 converseen for openSUSE:Factory checked in at 2013-11-04 12:45:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/converseen (Old) and /work/SRC/openSUSE:Factory/.converseen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "converseen" Changes: -------- --- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2013-10-03 15:46:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2013-11-04 12:45:47.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Oct 29 05:02:21 UTC 2013 - lazy.kent(a)opensuse.org + +- Update to 0.6.5. + * Various code improvements. +- Add converseen-0.6.5-russian.patch: correct and update Russian + translation. + +------------------------------------------------------------------- Old: ---- converseen-0.6.4.tar.bz2 New: ---- converseen-0.6.5-russian.patch converseen-0.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ converseen.spec ++++++ --- /var/tmp/diff_new_pack.kWbCVp/_old 2013-11-04 12:46:07.000000000 +0100 +++ /var/tmp/diff_new_pack.kWbCVp/_new 2013-11-04 12:46:07.000000000 +0100 @@ -17,13 +17,15 @@ Name: converseen -Version: 0.6.4 +Version: 0.6.5 Release: 0 Summary: Batch Image Conversion Tool License: GPL-3.0+ Group: Productivity/Graphics/Convertors Url: http://converseen.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM converseen-0.6.5-russian.patch lazy.kent(a)opensuse.org -- correct and update Russian translation +Patch0: converseen-0.6.5-russian.patch BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -49,7 +51,8 @@ %prep %setup -q -cp README.md README +%patch0 -p1 +cp -p README.md README chmod -x README COPYING %build @@ -84,11 +87,11 @@ %make_install popd rm -rf \ - %{buildroot}%{_datadir}/kde4 \ + %{buildroot}%{_datadir}/kde4/ \ %{buildroot}%{_datadir}/pixmaps/%{name}.png for size in 256x256 128x128 96x96 64x64 48x48 32x32 22x22 16x16 ; do install -dm 0755 \ - %{buildroot}%{_datadir}/icons/hicolor/${size}/apps + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/ convert -strip -resize ${size} res/%{name}.png \ %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png done @@ -111,5 +114,6 @@ %files lang -f %{name}.lang %defattr(-,root,root,-) %dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/loc/ %changelog ++++++ converseen-0.6.5-russian.patch ++++++ Index: converseen-0.6.5/loc/converseen_ru_RU.ts =================================================================== --- converseen-0.6.5.orig/loc/converseen_ru_RU.ts +++ converseen-0.6.5/loc/converseen_ru_RU.ts @@ -28,7 +28,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -В общем:</body></html></translation> +Всего:</body></html></translation> </message> <message> <source>Image:</source> @@ -36,7 +36,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Status...</source> - <translation>Статус...</translation> + <translation>Статус…</translation> </message> <message> <source>Conversion Status</source> @@ -56,7 +56,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -Сконвертированные:</body></html></translation> +Сконвертировано:</body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -84,7 +84,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Converted</source> - <translation>Сконвертированно</translation> + <translation>Сконвертировано</translation> </message> </context> <context> @@ -95,7 +95,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>About Converseen...</source> - <translation>O Converseen...</translation> + <translation>O Converseen…</translation> </message> <message> <source>Informations</source> @@ -133,7 +133,7 @@ p, li { white-space: pre-wrap; } Автор: Faster (Francesco Mondello) Email: <a href="faster3ck(a)gmail.com">faster3ck@gmail.com</a> Сайт проекта: <a href="http://converseen.sourceforge.net">converseen.sourceforge.net</a> -Моя домашняя страничка: <a href="http://fasterindesign.altervista.org">fasterindesign.altervista.org</a></body></html></translation> +Моя домашняя страница: <a href="http://fasterindesign.altervista.org">fasterindesign.altervista.org</a></body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -145,11 +145,11 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -Converseen это пакетный конвертер графических файлов. вы можете изменять размер и конвертировать изображения в более чем 100 форматов.</body></html></translation> +Converseen — это пакетный конвертер графических файлов. Вы можете изменять размер и конвертировать изображения в более чем 100 форматов.</body></html></translation> </message> <message> <source><html><head/><body>If you appreciate this work and would like to support the project, you are welcome to <a href="http://converseen.sourceforge.net/#donations">donate via Paypal</a>.</body></html></source> - <translation><html><head/><body>If you appreciate this work and would like to support the project, you are welcome to <a href="http://converseen.sourceforge.net/#donations">пожертвовать через Paypal</a>.</body></html></translation> + <translation><html><head/><body>Если вы цените эту работу и хотите поддержать проект, вы можете внести материальную <a href="http://converseen.sourceforge.net/#donations">поддержку через Paypal</a>.</body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -169,60 +169,61 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Hungarian translation: Charles Barcza - <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></source> - <translation>Перевод на Венгерский: Charles Barcza - <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></translation> + <translation>Перевод на венгерский: Charles Barcza — <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></translation> </message> <message> <source>Czech translation: Pavel Fric - <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></source> - <translation>Перевод на Чешский: Pavel Fric - <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></translation> + <translation>Перевод на чешский: Pavel Fric — <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></translation> </message> <message> <source>French Translation: Ludovic Troisi - <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a> </source> - <translation>Перевод на Французский: Ludovic Troisi - <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a> + <translation>Перевод на французский: Ludovic Troisi — <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a> </translation> </message> <message utf8="true"> <source>Brazilian Portuguese Translation: Márcio Moraes - <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></source> - <translation>Перевод на Бразильский Португальский: Márcio Moraes - <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></translation> + <translation>Перевод на бразильский португальский: Márcio Moraes — <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></translation> </message> <message> <source>German Translation: Marco Nickolai - <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></source> - <translation>Перевод на Немецкий: Marco Nickolai - <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></translation> + <translation>Перевод на немецкий: Marco Nickolai — <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></translation> </message> <message utf8="true"> <source>Spanish (Chile) Translation: Nelson Álvarez Sáez - <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a> </source> - <translation>Перевод на Испанский: Nelson Álvarez Sáez - <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a> + <translation>Перевод на испанский: Nelson Álvarez Sáez — <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a> </translation> </message> <message> <source>Turkish Translation: Zeugma - <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a> </source> - <translation>Перевод на турецкий: Zeugma - <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a> + <translation>Перевод на турецкий: Zeugma — <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a> </translation> </message> <message> <source>Russian Translation: Stasik Savorovsky - <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a></source> - <translation>Перевод на Русский: Stasik Savorovsky - <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a></translation> + <translation>Перевод на русский: Stasik Savorovsky — <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a>, +Kyrill Detinov — <a href="lazy.kent@opensuse.org">lazy.kent@opensuse.org</a></translation> </message> <message> <source><html><head/><body>Follow Converseen:</body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body>Следите за Converseen:</body></html></translation> </message> <message utf8="true"> <source>Polish Translation: Michał Olber from OSWorld.pl - <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></source> - <translation type="unfinished"></translation> + <translation>Перевод на польский: Michał Olber from OSWorld.pl — <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></translation> </message> </context> <context> <name>DialogOptions</name> <message> <source>Ok</source> - <translation>Ok</translation> + <translation>OK</translation> </message> <message> <source>Please, restart Converseen to apply current language!</source> - <translation>Пожалуйсто перезапустите Converseen для применения текущего языка!</translation> + <translation>Пожалуйста, перезапустите Converseen для применения текущего языка!</translation> </message> <message> <source>Cancel</source> @@ -238,7 +239,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Warning!</source> - <translation>Внимание!</translation> + <translation>Предупреждение!</translation> </message> <message> <source>Overwriting settings</source> @@ -254,14 +255,14 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Ask first</source> - <translation>Спрашивать вначале</translation> + <translation>Спрашивать перед записью</translation> </message> </context> <context> <name>DialogQuality</name> <message> <source>Ok</source> - <translation>Ok</translation> + <translation>OK</translation> </message> <message> <source>Png compression level</source> @@ -273,7 +274,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Quality 0 - 100:</source> - <translation>Качество 0 - 100:</translation> + <translation>Качество 0-100:</translation> </message> <message> <source>Cancel</source> @@ -319,15 +320,15 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&File</source> - <translation>&Фаил</translation> + <translation>&Файл</translation> </message> <message> <source>&Help</source> - <translation>П&омощь</translation> + <translation>&Справка</translation> </message> <message> <source>Show preview</source> - <translation>Показать предпросмотр</translation> + <translation>Предпросмотр</translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -355,7 +356,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Show image settings dialog...</source> - <translation>Показать диалог настройки изображений...</translation> + <translation>Показать диалог настройки изображений…</translation> </message> <message> <source>Width:</source> @@ -395,7 +396,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Converseen</source> - <translation></translation> + <translation>Converseen</translation> </message> <message> <source>Convert to:</source> @@ -415,7 +416,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose color</source> - <translation>Выберите цвет</translation> + <translation>Выбрать цвет</translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -503,7 +504,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>toolBar</source> - <translation>Панель Инструментов</translation> + <translation>Панель инструментов</translation> </message> <message> <source>&Open images</source> @@ -535,7 +536,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Remove &all</source> - <translation>Удалить &все</translation> + <translation>У&далить все</translation> </message> <message> <source>Remove all pictures</source> @@ -547,11 +548,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Check</source> - <translation>&Проверить</translation> + <translation>&Отметить</translation> </message> <message> <source>Check selected items</source> - <translation>Проверить выбранные элементы</translation> + <translation>Отметить выделенные элементы</translation> </message> <message> <source>Ctrl+H</source> @@ -559,11 +560,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Check a&ll</source> - <translation>Проверить в&се</translation> + <translation>Отметить &все</translation> </message> <message> <source>Check all items</source> - <translation>Проверить все элементы</translation> + <translation>Отметить все элементы</translation> </message> <message> <source>Ctrl+Alt+H</source> @@ -595,7 +596,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Uncheck all &items</source> - <translation>Снять выбор со всех &элементов</translation> + <translation>Снять отметку со все&х</translation> </message> <message> <source>Ctrl+Alt+J</source> @@ -603,11 +604,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Uncheck Items</source> - <translation>&Снять выбор с элементов</translation> + <translation>&Снять отметку</translation> </message> <message> <source>Uncheck selected items</source> - <translation>Снять выбор с выделенных элементов</translation> + <translation>Снять отметку с выделенных элементов</translation> </message> <message> <source>Ctrl+J</source> @@ -615,7 +616,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&About</source> - <translation>&Подробнее</translation> + <translation>&О программе</translation> </message> <message> <source>F1</source> @@ -623,7 +624,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Donate via Paypal</source> - <translation>Пожертвовать через Paypal</translation> + <translation>&Пожертвовать через Paypal</translation> </message> <message> <source>Dimensions</source> @@ -707,7 +708,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Warning!</source> - <translation>Внимание!</translation> + <translation>Предупреждение!</translation> </message> <message> <source>No preview!</source> @@ -719,7 +720,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Warning</source> - <translation>Внимание</translation> + <translation>Предупреждение</translation> </message> <message> <source>No image checked!</source> @@ -727,7 +728,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Processing...</source> - <translation>Обрабатывается...</translation> + <translation>Обрабатывается…</translation> </message> <message> <source>Open Directory</source> @@ -743,7 +744,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Please, specify a name!</source> - <translation>Пожалуйсто, укажите имя!</translation> + <translation>Пожалуйста, укажите имя!</translation> </message> <message> <source>You should specify a name. ++++++ converseen-0.6.4.tar.bz2 -> converseen-0.6.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/CMakeLists.txt new/converseen-0.6.5/CMakeLists.txt --- old/converseen-0.6.4/CMakeLists.txt 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/CMakeLists.txt 2013-10-28 17:29:27.000000000 +0100 @@ -108,13 +108,13 @@ install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kde4/services/ServiceMenus) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/FileFormats/Readableformats.txt new/converseen-0.6.5/FileFormats/Readableformats.txt --- old/converseen-0.6.4/FileFormats/Readableformats.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/converseen-0.6.5/FileFormats/Readableformats.txt 2013-10-28 17:29:27.000000000 +0100 @@ -0,0 +1,2 @@ +3FR A AAI AI ART ARW AVI AVS B BGR BGRA BIE BMP C CAL CALS CANVAS CAPTION CIN CLIPBOARD CMYK CMYKA CR2 CRW CUR CUT DCM DCR DCX DDS DFONT DNG DPX EMF EPDF EPI EPS EPSF EPSI EPT EPT2 EPT3 ERF FAX FITS FRACTAL FTS G G3 GIF GIF87 GRADIENT GRAY GROUP4 HALD HDR HRZ ICB ICO ICON INLINE IPL J2C JBG JBIG JNG JP2 JPC JPEG JPG JPX K K25 KDC LABEL M M2V M4V MAC MAP MAT MIFF MNG MONO MOV MP4 MPC MPEG MPG MRW MSL MSVG MTV MVG NEF NULL O ORF OTB OTF PAL PALM PAM PATTERN PBM PCD PCDS PCL PCT PCX PDB PDF PDFA PEF PES PFA PFB PFM PGM PGX PICON PICT PIX PJPEG PLASMA PNG PNG24 PNG32 PNG8 PNM PPM PS PSB PSD PTIF PWP R RADIAL-GRADIENT RAF RAS RGB RGBA RGBO RLA RLE SCR SCT SFW SGI SR2 SRF STEGANO SUN SVG SVGZ TEXT TGA TIFF TIF TILE TIM TTC TTF TXT UYVY VDA VICAR VID VIFF VST WBMP WMF WMFWIN32 WMV WMZ WPG X X3F XBM XC XCF XPM XPS XV XWD Y YCBCR YCBCRA YUV +All Supported Formats (*.3fr *.3FR *.a *.A *.aai *.AAI *.ai *.AI *.art *.ART *.arw *.ARW *.avi *.AVI *.avs *.AVS *.b *.B *.bgr *.BGR *.bgra *.BGRA *.bie *.BIE *.bmp *.BMP *.c *.C *.cal *.CAL *.cals *.CALS *.canvas *.CANVAS *.caption *.CAPTION *.cin *.CIN *.clipboard *.CLIPBOARD *.cmyk *.CMYK *.cmyka *.CMYKA *.cr2 *.CR2 *.crw *.CRW *.cur *.CUR *.cut *.CUT *.dcm *.DCM *.dcr *.DCR *.dcx *.DCX *.dds *.DDS *.dfont *.DFONT *.dng *.DNG *.dpx *.DPX *.emf *.EMF *.epdf *.EPDF *.epi *.EPI *.eps *.EPS *.epsf *.EPSF *.epsi *.EPSI *.ept *.EPT *.ept2 *.EPT2 *.ept3 *.EPT3 *.erf *.ERF *.fax *.FAX *.fits *.FITS *.fractal *.FRACTAL *.fts *.FTS *.g *.G *.g3 *.G3 *.gif *.GIF *.gif87 *.GIF87 *.gradient *.GRADIENT *.gray *.GRAY *.group4 *.GROUP4 *.hald *.HALD *.hdr *.HDR *.hrz *.HRZ *.icb *.ICB *.ico *.ICO *.icon *.ICON *.inline *.INLINE *.ipl *.IPL *.j2c *.J2C *.jbg *.JBG *.jbig *.JBIG *.jng *.JNG *.jp2 *.JP2 *.jpc *.JPC *.jpeg *.JPEG *.jpg *.JPG *.jpx *.JPX *.k *.K *.k25 *.K25 *.kdc *.KDC *.label *.LABEL *.m *.M *.m2v *.M2V *.m4v *.M4V *.mac *.MAC *.map *.MAP *.mat *.MAT *.miff *.MIFF *.mng *.MNG *.mono *.MONO *.mov *.MOV *.mp4 *.MP4 *.mpc *.MPC *.mpeg *.MPEG *.mpg *.MPG *.mrw *.MRW *.msl *.MSL *.msvg *.MSVG *.mtv *.MTV *.mvg *.MVG *.nef *.NEF *.null *.NULL *.o *.O *.orf *.ORF *.otb *.OTB *.otf *.OTF *.pal *.PAL *.palm *.PALM *.pam *.PAM *.pattern *.PATTERN *.pbm *.PBM *.pcd *.PCD *.pcds *.PCDS *.pcl *.PCL *.pct *.PCT *.pcx *.PCX *.pdb *.PDB *.pdf *.PDF *.pdfa *.PDFA *.pef *.PEF *.pes *.PES *.pfa *.PFA *.pfb *.PFB *.pfm *.PFM *.pgm *.PGM *.pgx *.PGX *.picon *.PICON *.pict *.PICT *.pix *.PIX *.pjpeg *.PJPEG *.plasma *.PLASMA *.png *.PNG *.png24 *.PNG24 *.png32 *.PNG32 *.png8 *.PNG8 *.pnm *.PNM *.ppm *.PPM *.ps *.PS *.psb *.PSB *.psd *.PSD *.ptif *.PTIF *.pwp *.PWP *.r *.R *.radial-gradient *.RADIAL-GRADIENT *.raf *.RAF *.ras *.RAS *.rgb *.RGB *.rgba *.RGBA *.rgbo *.RGBO *.rla *.RLA *.rle *.RLE *.scr *.SCR *.sct *.SCT *.sfw *.SFW *.sgi *.SGI *.sr2 *.SR2 *.srf *.SRF *.stegano *.STEGANO *.sun *.SUN *.svg *.SVG *.svgz *.SVGZ *.text *.TEXT *.tga *.TGA *.tiff *.TIFF *.tif *.TIF *.tile *.TILE *.tim *.TIM *.ttc *.TTC *.ttf *.TTF *.txt *.TXT *.uyvy *.UYVY *.vda *.VDA *.vicar *.VICAR *.vid *.VID *.viff *.VIFF *.vst *.VST *.wbmp *.WBMP *.wmf *.WMF *.wmfwin32 *.WMFWIN32 *.wmv *.WMV *.wmz *.WMZ *.wpg *.WPG *.x *.X *.x3f *.X3F *.xbm *.XBM *.xc *.XC *.xcf *.XCF *.xpm *.XPM *.xps *.XPS *.xv *.XV *.xwd *.XWD *.y *.Y *.ycbcr *.YCbCr *.ycbcra *.YCbCrA *.yuv *.YUV );;Hasselblad CFV/H3D39II [*.3fr] (*.3fr *.3FR );;Raw alpha samples [*.a] (*.a *.A );;AAI Dune image [*.aai] (*.aai *.AAI );;Adobe Illustrator CS2 [*.ai] (*.ai *.AI );;PFS: 1st Publisher Clip Art [*.art] (*.art *.ART );;Sony Alpha Raw Image Format [*.arw] (*.arw *.ARW );;Microsoft Audio/Visual Interleaved [*.avi] (*.avi *.AVI );;AVS X image [*.avs] (*.avs *.AVS );;Raw blue samples [*.b] (*.b *.B );;Raw blue, green, and red samples [*.bgr] (*.bgr *.BGR );;Raw blue, green, red, and alpha samples [*.bgra] (*.bgra *.BGRA );;Joint Bi-level Image experts Group interchange format [*.bie] (*.bie *.BIE );;Microsoft Windows bitmap image [*.bmp] (*.bmp *.BMP );;Raw cyan samples [*.c] (*.c *.C );;Continuous Acquisition and Life-cycle Support Type 1 [*.cal] (*.cal *.CAL );;Continuous Acquisition and Life-cycle Support Type 1 [*.cals] (*.cals *.CALS );;Constant image uniform color [*.canvas] (*.canvas *.CANVAS );;Image caption [*.caption] (*.caption *.CAPTION );;Cineon Image File [*.cin] (*.cin *.CIN );;The system clipboard [*.clipboard] (*.clipboard *.CLIPBOARD );;Raw cyan, magenta, yellow, and black samples [*.cmyk] (*.cmyk *.CMYK );;Raw cyan, magenta, yellow, black, and alpha samples [*.cmyka] (*.cmyka *.CMYKA );;Canon Digital Camera Raw Image Format [*.cr2] (*.cr2 *.CR2 );;Canon Digital Camera Raw Image Format [*.crw] (*.crw *.CRW );;Microsoft icon [*.cur] (*.cur *.CUR );;DR Halo [*.cut] (*.cut *.CUT );;Digital Imaging and Communications in Medicine image [*.dcm] (*.dcm *.DCM );;Kodak Digital Camera Raw Image File [*.dcr] (*.dcr *.DCR );;ZSoft IBM PC multi-page Paintbrush [*.dcx] (*.dcx *.DCX );;Microsoft DirectDraw Surface [*.dds] (*.dds *.DDS );;Multi-face font package [*.dfont] (*.dfont *.DFONT );;Digital Negative [*.dng] (*.dng *.DNG );;SMPTE 268M-2003 (DPX 2.0) [*.dpx] (*.dpx *.DPX );;Windows WIN32 API rendered Enhanced Meta File [*.emf] (*.emf *.EMF );;Encapsulated Portable Document Format [*.epdf] (*.epdf *.EPDF );;Encapsulated PostScript Interchange format [*.epi] (*.epi *.EPI );;Encapsulated PostScript [*.eps] (*.eps *.EPS );;Encapsulated PostScript [*.epsf] (*.epsf *.EPSF );;Encapsulated PostScript Interchange format [*.epsi] (*.epsi *.EPSI );;Encapsulated PostScript with TIFF preview [*.ept] (*.ept *.EPT );;Encapsulated PostScript Level II with TIFF preview [*.ept2] (*.ept2 *.EPT2 );;Encapsulated PostScript Level III with TIFF preview [*.ept3] (*.ept3 *.EPT3 );;Epson RAW Format [*.erf] (*.erf *.ERF );;Group 3 FAX [*.fax] (*.fax *.FAX );;Flexible Image Transport System [*.fits] (*.fits *.FITS );;Plasma fractal image [*.fractal] (*.fractal *.FRACTAL );;Flexible Image Transport System [*.fts] (*.fts *.FTS );;Raw green samples [*.g] (*.g *.G );;Group 3 FAX [*.g3] (*.g3 *.G3 );;CompuServe graphics interchange format [*.gif] (*.gif *.GIF );;CompuServe graphics interchange format [*.gif87] (*.gif87 *.GIF87 );;Gradual linear passing from one shade to another [*.gradient] (*.gradient *.GRADIENT );;Raw gray samples [*.gray] (*.gray *.GRAY );;Raw CCITT Group4 [*.group4] (*.group4 *.GROUP4 );;Identity Hald color lookup table image [*.hald] (*.hald *.HALD );;Radiance RGBE image format [*.hdr] (*.hdr *.HDR );;Slow Scan TeleVision [*.hrz] (*.hrz *.HRZ );;Truevision Targa image [*.icb] (*.icb *.ICB );;Microsoft icon [*.ico] (*.ico *.ICO );;Microsoft icon [*.icon] (*.icon *.ICON );;Base64-encoded inline images [*.inline] (*.inline *.INLINE );;IPL Image Sequence [*.ipl] (*.ipl *.IPL );;JPEG-2000 Code Stream Syntax [*.j2c] (*.j2c *.J2C );;Joint Bi-level Image experts Group interchange format [*.jbg] (*.jbg *.JBG );;Joint Bi-level Image experts Group interchange format [*.jbig] (*.jbig *.JBIG );;JPEG Network Graphics [*.jng] (*.jng *.JNG );;JPEG-2000 File Format Syntax [*.jp2] (*.jp2 *.JP2 );;JPEG-2000 Code Stream Syntax [*.jpc] (*.jpc *.JPC );;Joint Photographic Experts Group JFIF format [*.jpeg] (*.jpeg *.JPEG );;Joint Photographic Experts Group JFIF format [*.jpg] (*.jpg *.JPG );;JPEG-2000 File Format Syntax [*.jpx] (*.jpx *.JPX );;Raw black samples [*.k] (*.k *.K );;Kodak Digital Camera Raw Image Format [*.k25] (*.k25 *.K25 );;Kodak Digital Camera Raw Image Format [*.kdc] (*.kdc *.KDC );;Image label [*.label] (*.label *.LABEL );;Raw magenta samples [*.m] (*.m *.M );;MPEG Video Stream [*.m2v] (*.m2v *.M2V );;Raw MPEG-4 Video [*.m4v] (*.m4v *.M4V );;MAC Paint [*.mac] (*.mac *.MAC );;Colormap intensities and indices [*.map] (*.map *.MAP );;MATLAB level 5 image format [*.mat] (*.mat *.MAT );;Magick Image File Format [*.miff] (*.miff *.MIFF );;Multiple-image Network Graphics [*.mng] (*.mng *.MNG );;Raw bi-level bitmap [*.mono] (*.mono *.MONO );;MPEG Video Stream [*.mov] (*.mov *.MOV );;MPEG-4 Video Stream [*.mp4] (*.mp4 *.MP4 );;Magick Persistent Cache image format [*.mpc] (*.mpc *.MPC );;MPEG Video Stream [*.mpeg] (*.mpeg *.MPEG );;MPEG Video Stream [*.mpg] (*.mpg *.MPG );;Sony (Minolta) Raw Image File [*.mrw] (*.mrw *.MRW );;Magick Scripting Language [*.msl] (*.msl *.MSL );;ImageMagick's own SVG internal renderer [*.msvg] (*.msvg *.MSVG );;MTV Raytracing image format [*.mtv] (*.mtv *.MTV );;Magick Vector Graphics [*.mvg] (*.mvg *.MVG );;Nikon Digital SLR Camera Raw Image File [*.nef] (*.nef *.NEF );;Constant image of uniform color [*.null] (*.null *.NULL );;Raw opacity samples [*.o] (*.o *.O );;Olympus Digital Camera Raw Image File [*.orf] (*.orf *.ORF );;On-the-air bitmap [*.otb] (*.otb *.OTB );;Open Type font [*.otf] (*.otf *.OTF );;16bit/pixel interleaved YUV [*.pal] (*.pal *.PAL );;Palm pixmap [*.palm] (*.palm *.PALM );;Common 2-dimensional bitmap format [*.pam] (*.pam *.PAM );;Predefined pattern [*.pattern] (*.pattern *.PATTERN );;Portable bitmap format (black and white) [*.pbm] (*.pbm *.PBM );;Photo CD [*.pcd] (*.pcd *.PCD );;Photo CD [*.pcds] (*.pcds *.PCDS );;Printer Control Language [*.pcl] (*.pcl *.PCL );;Apple Macintosh QuickDraw/PICT [*.pct] (*.pct *.PCT );;ZSoft IBM PC Paintbrush [*.pcx] (*.pcx *.PCX );;Palm Database ImageViewer Format [*.pdb] (*.pdb *.PDB );;Portable Document Format [*.pdf] (*.pdf *.PDF );;Portable Document Archive Format [*.pdfa] (*.pdfa *.PDFA );;Pentax Electronic File [*.pef] (*.pef *.PEF );;Embrid Embroidery Format [*.pes] (*.pes *.PES );;Postscript Type 1 font (ASCII) [*.pfa] (*.pfa *.PFA );;Postscript Type 1 font (binary) [*.pfb] (*.pfb *.PFB );;Portable float format [*.pfm] (*.pfm *.PFM );;Portable graymap format (gray scale) [*.pgm] (*.pgm *.PGM );;JPEG-2000 VM Format [*.pgx] (*.pgx *.PGX );;Personal Icon [*.picon] (*.picon *.PICON );;Apple Macintosh QuickDraw/PICT [*.pict] (*.pict *.PICT );;Alias/Wavefront RLE image format [*.pix] (*.pix *.PIX );;Joint Photographic Experts Group JFIF format [*.pjpeg] (*.pjpeg *.PJPEG );;Plasma fractal image [*.plasma] (*.plasma *.PLASMA );;Portable Network Graphics [*.png] (*.png *.PNG );;opaque 24-bit RGB [*.png24] (*.png24 *.PNG24 );;opaque or transparent 32-bit RGBA [*.png32] (*.png32 *.PNG32 );;8-bit indexed with optional binary transparency [*.png8] (*.png8 *.PNG8 );;Portable anymap [*.pnm] (*.pnm *.PNM );;Portable pixmap format (color) [*.ppm] (*.ppm *.PPM );;PostScript [*.ps] (*.ps *.PS );;Adobe Large Document Format [*.psb] (*.psb *.PSB );;Adobe Photoshop bitmap [*.psd] (*.psd *.PSD );;Pyramid encoded TIFF [*.ptif] (*.ptif *.PTIF );;Seattle Film Works [*.pwp] (*.pwp *.PWP );;Raw red samples [*.r] (*.r *.R );;Gradual radial passing from one shade to another [*.radial-gradient] (*.radial-gradient *.RADIAL-GRADIENT );;Fuji CCD-RAW Graphic File [*.raf] (*.raf *.RAF );;SUN Rasterfile [*.ras] (*.ras *.RAS );;Raw red, green, and blue samples [*.rgb] (*.rgb *.RGB );;Raw red, green, blue, and alpha samples [*.rgba] (*.rgba *.RGBA );;Raw red, green, blue, and opacity samples [*.rgbo] (*.rgbo *.RGBO );;Alias/Wavefront image [*.rla] (*.rla *.RLA );;Utah Run length encoded image [*.rle] (*.rle *.RLE );;ZX-Spectrum SCREEN$ [*.scr] (*.scr *.SCR );;Scitex HandShake [*.sct] (*.sct *.SCT );;Seattle Film Works [*.sfw] (*.sfw *.SFW );;Irix RGB image [*.sgi] (*.sgi *.SGI );;Sony Raw Format 2 [*.sr2] (*.sr2 *.SR2 );;Sony Raw Format [*.srf] (*.srf *.SRF );;Steganographic image [*.stegano] (*.stegano *.STEGANO );;SUN Rasterfile [*.sun] (*.sun *.SUN );;Scalable Vector Graphics [*.svg] (*.svg *.SVG );;Compressed Scalable Vector Graphics [*.svgz] (*.svgz *.SVGZ );;Text [*.text] (*.text *.TEXT );;Truevision Targa image [*.tga] (*.tga *.TGA );;Tagged Image File Format [*.tiff] (*.tiff *.TIFF );;Tagged Image File Format [*.tif] (*.tif *.TIF );;Tile image with a texture [*.tile] (*.tile *.TILE );;PSX TIM [*.tim] (*.tim *.TIM );;TrueType font collection [*.ttc] (*.ttc *.TTC );;TrueType font [*.ttf] (*.ttf *.TTF );;Text [*.txt] (*.txt *.TXT );;16bit/pixel interleaved YUV [*.uyvy] (*.uyvy *.UYVY );;Truevision Targa image [*.vda] (*.vda *.VDA );;VICAR rasterfile format [*.vicar] (*.vicar *.VICAR );;Visual Image Directory [*.vid] (*.vid *.VID );;Khoros Visualization image [*.viff] (*.viff *.VIFF );;Truevision Targa image [*.vst] (*.vst *.VST );;Wireless Bitmap (level 0) image [*.wbmp] (*.wbmp *.WBMP );;Windows Meta File [*.wmf] (*.wmf *.WMF );;Windows WIN32 API rendered Meta File [*.wmfwin32] (*.wmfwin32 *.WMFWIN32 );;Windows Media Video [*.wmv] (*.wmv *.WMV );;Compressed Windows Meta File [*.wmz] (*.wmz *.WMZ );;Word Perfect Graphics [*.wpg] (*.wpg *.WPG );;X Image [*.x] (*.x *.X );;Sigma Camera RAW Picture File [*.x3f] (*.x3f *.X3F );;X Windows system bitmap (black and white) [*.xbm] (*.xbm *.XBM );;Constant image uniform color [*.xc] (*.xc *.XC );;GIMP image [*.xcf] (*.xcf *.XCF );;X Windows system pixmap (color) [*.xpm] (*.xpm *.XPM );;Microsoft XML Paper Specification [*.xps] (*.xps *.XPS );;Khoros Visualization image [*.xv] (*.xv *.XV );;X Windows system window dump (color) [*.xwd] (*.xwd *.XWD );;Raw yellow samples [*.y] (*.y *.Y );;Raw Y, Cb, and Cr samples [*.ycbcr] (*.ycbcr *.YCbCr );;Raw Y, Cb, Cr, and alpha samples [*.ycbcra] (*.ycbcra *.YCbCrA );;CCIR 601 4:1:1 or 4:2:2 [*.yuv] (*.yuv *.YUV ) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/FileFormats/WritableFormats.txt new/converseen-0.6.5/FileFormats/WritableFormats.txt --- old/converseen-0.6.4/FileFormats/WritableFormats.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/converseen-0.6.5/FileFormats/WritableFormats.txt 2013-10-28 17:29:27.000000000 +0100 @@ -0,0 +1,130 @@ +A - (Raw alpha samples) +AAI - (AAI Dune image) +AI - (Adobe Illustrator CS2) +ART - (PFS: 1st Publisher Clip Art) +AVS - (AVS X image) +B - (Raw blue samples) +BGR - (Raw blue, green, and red samples) +BGRA - (Raw blue, green, red, and alpha samples) +BIE - (Joint Bi-level Image experts Group interchange format) +BMP - (Microsoft Windows bitmap image) +C - (Raw cyan samples) +CAL - (Continuous Acquisition and Life-cycle Support Type 1) +CALS - (Continuous Acquisition and Life-cycle Support Type 1) +CIN - (Cineon Image File) +CLIPBOARD - (The system clipboard) +CMYK - (Raw cyan, magenta, yellow, and black samples) +CMYKA - (Raw cyan, magenta, yellow, black, and alpha samples) +CUR - (Microsoft icon) +DCX - (ZSoft IBM PC multi-page Paintbrush) +DPX - (SMPTE 268M-2003 (DPX 2.0)) +EPDF - (Encapsulated Portable Document Format) +EPI - (Encapsulated PostScript Interchange format) +EPS - (Encapsulated PostScript) +EPSF - (Encapsulated PostScript) +EPSI - (Encapsulated PostScript Interchange format) +EPT - (Encapsulated PostScript with TIFF preview) +EPT2 - (Encapsulated PostScript Level II with TIFF preview) +EPT3 - (Encapsulated PostScript Level III with TIFF preview) +FAX - (Group 3 FAX) +FITS - (Flexible Image Transport System) +FTS - (Flexible Image Transport System) +G - (Raw green samples) +G3 - (Group 3 FAX) +GIF - (CompuServe graphics interchange format) +GIF87 - (CompuServe graphics interchange format) +GRAY - (Raw gray samples) +GROUP4 - (Raw CCITT Group4) +HDR - (Radiance RGBE image format) +HRZ - (Slow Scan TeleVision) +ICB - (Truevision Targa image) +ICO - (Microsoft icon) +ICON - (Microsoft icon) +IPL - (IPL Image Sequence) +J2C - (JPEG-2000 Code Stream Syntax) +JBG - (Joint Bi-level Image experts Group interchange format) +JBIG - (Joint Bi-level Image experts Group interchange format) +JNG - (JPEG Network Graphics) +JP2 - (JPEG-2000 File Format Syntax) +JPC - (JPEG-2000 Code Stream Syntax) +JPEG - (Joint Photographic Experts Group JFIF format) +JPG - (Joint Photographic Experts Group JFIF format) +JPX - (JPEG-2000 File Format Syntax) +K - (Raw black samples) +M - (Raw magenta samples) +M2V - (MPEG Video Stream) +M4V - (Raw MPEG-4 Video) +MAP - (Colormap intensities and indices) +MAT - (MATLAB level 5 image format) +MIFF - (Magick Image File Format) +MNG - (Multiple-image Network Graphics) +MONO - (Raw bi-level bitmap) +MOV - (MPEG Video Stream) +MP4 - (MPEG-4 Video Stream) +MPC - (Magick Persistent Cache image format) +MPEG - (MPEG Video Stream) +MPG - (MPEG Video Stream) +MSL - (Magick Scripting Language) +MSVG - (ImageMagick's own SVG internal renderer) +MTV - (MTV Raytracing image format) +MVG - (Magick Vector Graphics) +NULL - (Constant image of uniform color) +O - (Raw opacity samples) +OTB - (On-the-air bitmap) +PAL - (16bit/pixel interleaved YUV) +PALM - (Palm pixmap) +PAM - (Common 2-dimensional bitmap format) +PBM - (Portable bitmap format (black and white)) +PCD - (Photo CD) +PCDS - (Photo CD) +PCL - (Printer Control Language) +PCT - (Apple Macintosh QuickDraw/PICT) +PCX - (ZSoft IBM PC Paintbrush) +PDB - (Palm Database ImageViewer Format) +PDF - (Portable Document Format) +PDFA - (Portable Document Archive Format) +PFM - (Portable float format) +PGM - (Portable graymap format (gray scale)) +PICON - (Personal Icon) +PICT - (Apple Macintosh QuickDraw/PICT) +PJPEG - (Joint Photographic Experts Group JFIF format) +PNG - (Portable Network Graphics) +PNG24 - (opaque 24-bit RGB) +PNG32 - (opaque or transparent 32-bit RGBA) +PNG8 - (8-bit indexed with optional binary transparency) +PNM - (Portable anymap) +PPM - (Portable pixmap format (color)) +PS - (PostScript) +PSB - (Adobe Large Document Format) +PSD - (Adobe Photoshop bitmap) +PTIF - (Pyramid encoded TIFF) +R - (Raw red samples) +RAS - (SUN Rasterfile) +RGB - (Raw red, green, and blue samples) +RGBA - (Raw red, green, blue, and alpha samples) +RGBO - (Raw red, green, blue, and opacity samples) +SGI - (Irix RGB image) +SUN - (SUN Rasterfile) +SVG - (Scalable Vector Graphics) +SVGZ - (Compressed Scalable Vector Graphics) +TEXT - (Text) +TGA - (Truevision Targa image) +TIFF - (Tagged Image File Format) +TXT - (Text) +UYVY - (16bit/pixel interleaved YUV) +VDA - (Truevision Targa image) +VICAR - (VICAR rasterfile format) +VID - (Visual Image Directory) +VIFF - (Khoros Visualization image) +VST - (Truevision Targa image) +WBMP - (Wireless Bitmap (level 0) image) +WMV - (Windows Media Video) +X - (X Image) +XBM - (X Windows system bitmap (black and white)) +XPM - (X Windows system pixmap (color)) +XV - (Khoros Visualization image) +XWD - (X Windows system window dump (color)) +Y - (Raw yellow samples) +YCbCr - (Raw Y, Cb, and Cr samples) +YCbCrA - (Raw Y, Cb, Cr, and alpha samples) +YUV - (CCIR 601 4:1:1 or 4:2:2) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/Windows/Readableformats.txt new/converseen-0.6.5/Windows/Readableformats.txt --- old/converseen-0.6.4/Windows/Readableformats.txt 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/Windows/Readableformats.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -3FR A AAI AI ART ARW AVI AVS B BGR BGRA BIE BMP C CAL CALS CANVAS CAPTION CIN CLIPBOARD CMYK CMYKA CR2 CRW CUR CUT DCM DCR DCX DDS DFONT DNG DPX EMF EPDF EPI EPS EPSF EPSI EPT EPT2 EPT3 ERF FAX FITS FRACTAL FTS G G3 GIF GIF87 GRADIENT GRAY GROUP4 HALD HDR HRZ ICB ICO ICON INLINE IPL J2C JBG JBIG JNG JP2 JPC JPEG JPG JPX K K25 KDC LABEL M M2V M4V MAC MAP MAT MIFF MNG MONO MOV MP4 MPC MPEG MPG MRW MSL MSVG MTV MVG NEF NULL O ORF OTB OTF PAL PALM PAM PATTERN PBM PCD PCDS PCL PCT PCX PDB PDF PDFA PEF PES PFA PFB PFM PGM PGX PICON PICT PIX PJPEG PLASMA PNG PNG24 PNG32 PNG8 PNM PPM PS PSB PSD PTIF PWP R RADIAL-GRADIENT RAF RAS RGB RGBA RGBO RLA RLE SCR SCT SFW SGI SR2 SRF STEGANO SUN SVG SVGZ TEXT TGA TIFF TIF TILE TIM TTC TTF TXT UYVY VDA VICAR VID VIFF VST WBMP WMF WMFWIN32 WMV WMZ WPG X X3F XBM XC XCF XPM XPS XV XWD Y YCBCR YCBCRA YUV -All Supported Formats (*.3fr *.3FR *.a *.A *.aai *.AAI *.ai *.AI *.art *.ART *.arw *.ARW *.avi *.AVI *.avs *.AVS *.b *.B *.bgr *.BGR *.bgra *.BGRA *.bie *.BIE *.bmp *.BMP *.c *.C *.cal *.CAL *.cals *.CALS *.canvas *.CANVAS *.caption *.CAPTION *.cin *.CIN *.clipboard *.CLIPBOARD *.cmyk *.CMYK *.cmyka *.CMYKA *.cr2 *.CR2 *.crw *.CRW *.cur *.CUR *.cut *.CUT *.dcm *.DCM *.dcr *.DCR *.dcx *.DCX *.dds *.DDS *.dfont *.DFONT *.dng *.DNG *.dpx *.DPX *.emf *.EMF *.epdf *.EPDF *.epi *.EPI *.eps *.EPS *.epsf *.EPSF *.epsi *.EPSI *.ept *.EPT *.ept2 *.EPT2 *.ept3 *.EPT3 *.erf *.ERF *.fax *.FAX *.fits *.FITS *.fractal *.FRACTAL *.fts *.FTS *.g *.G *.g3 *.G3 *.gif *.GIF *.gif87 *.GIF87 *.gradient *.GRADIENT *.gray *.GRAY *.group4 *.GROUP4 *.hald *.HALD *.hdr *.HDR *.hrz *.HRZ *.icb *.ICB *.ico *.ICO *.icon *.ICON *.inline *.INLINE *.ipl *.IPL *.j2c *.J2C *.jbg *.JBG *.jbig *.JBIG *.jng *.JNG *.jp2 *.JP2 *.jpc *.JPC *.jpeg *.JPEG *.jpg *.JPG *.jpx *.JPX *.k *.K *.k25 *.K25 *.kdc *.KDC *.label *.LABEL *.m *.M *.m2v *.M2V *.m4v *.M4V *.mac *.MAC *.map *.MAP *.mat *.MAT *.miff *.MIFF *.mng *.MNG *.mono *.MONO *.mov *.MOV *.mp4 *.MP4 *.mpc *.MPC *.mpeg *.MPEG *.mpg *.MPG *.mrw *.MRW *.msl *.MSL *.msvg *.MSVG *.mtv *.MTV *.mvg *.MVG *.nef *.NEF *.null *.NULL *.o *.O *.orf *.ORF *.otb *.OTB *.otf *.OTF *.pal *.PAL *.palm *.PALM *.pam *.PAM *.pattern *.PATTERN *.pbm *.PBM *.pcd *.PCD *.pcds *.PCDS *.pcl *.PCL *.pct *.PCT *.pcx *.PCX *.pdb *.PDB *.pdf *.PDF *.pdfa *.PDFA *.pef *.PEF *.pes *.PES *.pfa *.PFA *.pfb *.PFB *.pfm *.PFM *.pgm *.PGM *.pgx *.PGX *.picon *.PICON *.pict *.PICT *.pix *.PIX *.pjpeg *.PJPEG *.plasma *.PLASMA *.png *.PNG *.png24 *.PNG24 *.png32 *.PNG32 *.png8 *.PNG8 *.pnm *.PNM *.ppm *.PPM *.ps *.PS *.psb *.PSB *.psd *.PSD *.ptif *.PTIF *.pwp *.PWP *.r *.R *.radial-gradient *.RADIAL-GRADIENT *.raf *.RAF *.ras *.RAS *.rgb *.RGB *.rgba *.RGBA *.rgbo *.RGBO *.rla *.RLA *.rle *.RLE *.scr *.SCR *.sct *.SCT *.sfw *.SFW *.sgi *.SGI *.sr2 *.SR2 *.srf *.SRF *.stegano *.STEGANO *.sun *.SUN *.svg *.SVG *.svgz *.SVGZ *.text *.TEXT *.tga *.TGA *.tiff *.TIFF *.tif *.TIF *.tile *.TILE *.tim *.TIM *.ttc *.TTC *.ttf *.TTF *.txt *.TXT *.uyvy *.UYVY *.vda *.VDA *.vicar *.VICAR *.vid *.VID *.viff *.VIFF *.vst *.VST *.wbmp *.WBMP *.wmf *.WMF *.wmfwin32 *.WMFWIN32 *.wmv *.WMV *.wmz *.WMZ *.wpg *.WPG *.x *.X *.x3f *.X3F *.xbm *.XBM *.xc *.XC *.xcf *.XCF *.xpm *.XPM *.xps *.XPS *.xv *.XV *.xwd *.XWD *.y *.Y *.ycbcr *.YCbCr *.ycbcra *.YCbCrA *.yuv *.YUV );;Hasselblad CFV/H3D39II [*.3fr] (*.3fr *.3FR );;Raw alpha samples [*.a] (*.a *.A );;AAI Dune image [*.aai] (*.aai *.AAI );;Adobe Illustrator CS2 [*.ai] (*.ai *.AI );;PFS: 1st Publisher Clip Art [*.art] (*.art *.ART );;Sony Alpha Raw Image Format [*.arw] (*.arw *.ARW );;Microsoft Audio/Visual Interleaved [*.avi] (*.avi *.AVI );;AVS X image [*.avs] (*.avs *.AVS );;Raw blue samples [*.b] (*.b *.B );;Raw blue, green, and red samples [*.bgr] (*.bgr *.BGR );;Raw blue, green, red, and alpha samples [*.bgra] (*.bgra *.BGRA );;Joint Bi-level Image experts Group interchange format [*.bie] (*.bie *.BIE );;Microsoft Windows bitmap image [*.bmp] (*.bmp *.BMP );;Raw cyan samples [*.c] (*.c *.C );;Continuous Acquisition and Life-cycle Support Type 1 [*.cal] (*.cal *.CAL );;Continuous Acquisition and Life-cycle Support Type 1 [*.cals] (*.cals *.CALS );;Constant image uniform color [*.canvas] (*.canvas *.CANVAS );;Image caption [*.caption] (*.caption *.CAPTION );;Cineon Image File [*.cin] (*.cin *.CIN );;The system clipboard [*.clipboard] (*.clipboard *.CLIPBOARD );;Raw cyan, magenta, yellow, and black samples [*.cmyk] (*.cmyk *.CMYK );;Raw cyan, magenta, yellow, black, and alpha samples [*.cmyka] (*.cmyka *.CMYKA );;Canon Digital Camera Raw Image Format [*.cr2] (*.cr2 *.CR2 );;Canon Digital Camera Raw Image Format [*.crw] (*.crw *.CRW );;Microsoft icon [*.cur] (*.cur *.CUR );;DR Halo [*.cut] (*.cut *.CUT );;Digital Imaging and Communications in Medicine image [*.dcm] (*.dcm *.DCM );;Kodak Digital Camera Raw Image File [*.dcr] (*.dcr *.DCR );;ZSoft IBM PC multi-page Paintbrush [*.dcx] (*.dcx *.DCX );;Microsoft DirectDraw Surface [*.dds] (*.dds *.DDS );;Multi-face font package [*.dfont] (*.dfont *.DFONT );;Digital Negative [*.dng] (*.dng *.DNG );;SMPTE 268M-2003 (DPX 2.0) [*.dpx] (*.dpx *.DPX );;Windows WIN32 API rendered Enhanced Meta File [*.emf] (*.emf *.EMF );;Encapsulated Portable Document Format [*.epdf] (*.epdf *.EPDF );;Encapsulated PostScript Interchange format [*.epi] (*.epi *.EPI );;Encapsulated PostScript [*.eps] (*.eps *.EPS );;Encapsulated PostScript [*.epsf] (*.epsf *.EPSF );;Encapsulated PostScript Interchange format [*.epsi] (*.epsi *.EPSI );;Encapsulated PostScript with TIFF preview [*.ept] (*.ept *.EPT );;Encapsulated PostScript Level II with TIFF preview [*.ept2] (*.ept2 *.EPT2 );;Encapsulated PostScript Level III with TIFF preview [*.ept3] (*.ept3 *.EPT3 );;Epson RAW Format [*.erf] (*.erf *.ERF );;Group 3 FAX [*.fax] (*.fax *.FAX );;Flexible Image Transport System [*.fits] (*.fits *.FITS );;Plasma fractal image [*.fractal] (*.fractal *.FRACTAL );;Flexible Image Transport System [*.fts] (*.fts *.FTS );;Raw green samples [*.g] (*.g *.G );;Group 3 FAX [*.g3] (*.g3 *.G3 );;CompuServe graphics interchange format [*.gif] (*.gif *.GIF );;CompuServe graphics interchange format [*.gif87] (*.gif87 *.GIF87 );;Gradual linear passing from one shade to another [*.gradient] (*.gradient *.GRADIENT );;Raw gray samples [*.gray] (*.gray *.GRAY );;Raw CCITT Group4 [*.group4] (*.group4 *.GROUP4 );;Identity Hald color lookup table image [*.hald] (*.hald *.HALD );;Radiance RGBE image format [*.hdr] (*.hdr *.HDR );;Slow Scan TeleVision [*.hrz] (*.hrz *.HRZ );;Truevision Targa image [*.icb] (*.icb *.ICB );;Microsoft icon [*.ico] (*.ico *.ICO );;Microsoft icon [*.icon] (*.icon *.ICON );;Base64-encoded inline images [*.inline] (*.inline *.INLINE );;IPL Image Sequence [*.ipl] (*.ipl *.IPL );;JPEG-2000 Code Stream Syntax [*.j2c] (*.j2c *.J2C );;Joint Bi-level Image experts Group interchange format [*.jbg] (*.jbg *.JBG );;Joint Bi-level Image experts Group interchange format [*.jbig] (*.jbig *.JBIG );;JPEG Network Graphics [*.jng] (*.jng *.JNG );;JPEG-2000 File Format Syntax [*.jp2] (*.jp2 *.JP2 );;JPEG-2000 Code Stream Syntax [*.jpc] (*.jpc *.JPC );;Joint Photographic Experts Group JFIF format [*.jpeg] (*.jpeg *.JPEG );;Joint Photographic Experts Group JFIF format [*.jpg] (*.jpg *.JPG );;JPEG-2000 File Format Syntax [*.jpx] (*.jpx *.JPX );;Raw black samples [*.k] (*.k *.K );;Kodak Digital Camera Raw Image Format [*.k25] (*.k25 *.K25 );;Kodak Digital Camera Raw Image Format [*.kdc] (*.kdc *.KDC );;Image label [*.label] (*.label *.LABEL );;Raw magenta samples [*.m] (*.m *.M );;MPEG Video Stream [*.m2v] (*.m2v *.M2V );;Raw MPEG-4 Video [*.m4v] (*.m4v *.M4V );;MAC Paint [*.mac] (*.mac *.MAC );;Colormap intensities and indices [*.map] (*.map *.MAP );;MATLAB level 5 image format [*.mat] (*.mat *.MAT );;Magick Image File Format [*.miff] (*.miff *.MIFF );;Multiple-image Network Graphics [*.mng] (*.mng *.MNG );;Raw bi-level bitmap [*.mono] (*.mono *.MONO );;MPEG Video Stream [*.mov] (*.mov *.MOV );;MPEG-4 Video Stream [*.mp4] (*.mp4 *.MP4 );;Magick Persistent Cache image format [*.mpc] (*.mpc *.MPC );;MPEG Video Stream [*.mpeg] (*.mpeg *.MPEG );;MPEG Video Stream [*.mpg] (*.mpg *.MPG );;Sony (Minolta) Raw Image File [*.mrw] (*.mrw *.MRW );;Magick Scripting Language [*.msl] (*.msl *.MSL );;ImageMagick's own SVG internal renderer [*.msvg] (*.msvg *.MSVG );;MTV Raytracing image format [*.mtv] (*.mtv *.MTV );;Magick Vector Graphics [*.mvg] (*.mvg *.MVG );;Nikon Digital SLR Camera Raw Image File [*.nef] (*.nef *.NEF );;Constant image of uniform color [*.null] (*.null *.NULL );;Raw opacity samples [*.o] (*.o *.O );;Olympus Digital Camera Raw Image File [*.orf] (*.orf *.ORF );;On-the-air bitmap [*.otb] (*.otb *.OTB );;Open Type font [*.otf] (*.otf *.OTF );;16bit/pixel interleaved YUV [*.pal] (*.pal *.PAL );;Palm pixmap [*.palm] (*.palm *.PALM );;Common 2-dimensional bitmap format [*.pam] (*.pam *.PAM );;Predefined pattern [*.pattern] (*.pattern *.PATTERN );;Portable bitmap format (black and white) [*.pbm] (*.pbm *.PBM );;Photo CD [*.pcd] (*.pcd *.PCD );;Photo CD [*.pcds] (*.pcds *.PCDS );;Printer Control Language [*.pcl] (*.pcl *.PCL );;Apple Macintosh QuickDraw/PICT [*.pct] (*.pct *.PCT );;ZSoft IBM PC Paintbrush [*.pcx] (*.pcx *.PCX );;Palm Database ImageViewer Format [*.pdb] (*.pdb *.PDB );;Portable Document Format [*.pdf] (*.pdf *.PDF );;Portable Document Archive Format [*.pdfa] (*.pdfa *.PDFA );;Pentax Electronic File [*.pef] (*.pef *.PEF );;Embrid Embroidery Format [*.pes] (*.pes *.PES );;Postscript Type 1 font (ASCII) [*.pfa] (*.pfa *.PFA );;Postscript Type 1 font (binary) [*.pfb] (*.pfb *.PFB );;Portable float format [*.pfm] (*.pfm *.PFM );;Portable graymap format (gray scale) [*.pgm] (*.pgm *.PGM );;JPEG-2000 VM Format [*.pgx] (*.pgx *.PGX );;Personal Icon [*.picon] (*.picon *.PICON );;Apple Macintosh QuickDraw/PICT [*.pict] (*.pict *.PICT );;Alias/Wavefront RLE image format [*.pix] (*.pix *.PIX );;Joint Photographic Experts Group JFIF format [*.pjpeg] (*.pjpeg *.PJPEG );;Plasma fractal image [*.plasma] (*.plasma *.PLASMA );;Portable Network Graphics [*.png] (*.png *.PNG );;opaque 24-bit RGB [*.png24] (*.png24 *.PNG24 );;opaque or transparent 32-bit RGBA [*.png32] (*.png32 *.PNG32 );;8-bit indexed with optional binary transparency [*.png8] (*.png8 *.PNG8 );;Portable anymap [*.pnm] (*.pnm *.PNM );;Portable pixmap format (color) [*.ppm] (*.ppm *.PPM );;PostScript [*.ps] (*.ps *.PS );;Adobe Large Document Format [*.psb] (*.psb *.PSB );;Adobe Photoshop bitmap [*.psd] (*.psd *.PSD );;Pyramid encoded TIFF [*.ptif] (*.ptif *.PTIF );;Seattle Film Works [*.pwp] (*.pwp *.PWP );;Raw red samples [*.r] (*.r *.R );;Gradual radial passing from one shade to another [*.radial-gradient] (*.radial-gradient *.RADIAL-GRADIENT );;Fuji CCD-RAW Graphic File [*.raf] (*.raf *.RAF );;SUN Rasterfile [*.ras] (*.ras *.RAS );;Raw red, green, and blue samples [*.rgb] (*.rgb *.RGB );;Raw red, green, blue, and alpha samples [*.rgba] (*.rgba *.RGBA );;Raw red, green, blue, and opacity samples [*.rgbo] (*.rgbo *.RGBO );;Alias/Wavefront image [*.rla] (*.rla *.RLA );;Utah Run length encoded image [*.rle] (*.rle *.RLE );;ZX-Spectrum SCREEN$ [*.scr] (*.scr *.SCR );;Scitex HandShake [*.sct] (*.sct *.SCT );;Seattle Film Works [*.sfw] (*.sfw *.SFW );;Irix RGB image [*.sgi] (*.sgi *.SGI );;Sony Raw Format 2 [*.sr2] (*.sr2 *.SR2 );;Sony Raw Format [*.srf] (*.srf *.SRF );;Steganographic image [*.stegano] (*.stegano *.STEGANO );;SUN Rasterfile [*.sun] (*.sun *.SUN );;Scalable Vector Graphics [*.svg] (*.svg *.SVG );;Compressed Scalable Vector Graphics [*.svgz] (*.svgz *.SVGZ );;Text [*.text] (*.text *.TEXT );;Truevision Targa image [*.tga] (*.tga *.TGA );;Tagged Image File Format [*.tiff] (*.tiff *.TIFF );;Tagged Image File Format [*.tif] (*.tif *.TIF );;Tile image with a texture [*.tile] (*.tile *.TILE );;PSX TIM [*.tim] (*.tim *.TIM );;TrueType font collection [*.ttc] (*.ttc *.TTC );;TrueType font [*.ttf] (*.ttf *.TTF );;Text [*.txt] (*.txt *.TXT );;16bit/pixel interleaved YUV [*.uyvy] (*.uyvy *.UYVY );;Truevision Targa image [*.vda] (*.vda *.VDA );;VICAR rasterfile format [*.vicar] (*.vicar *.VICAR );;Visual Image Directory [*.vid] (*.vid *.VID );;Khoros Visualization image [*.viff] (*.viff *.VIFF );;Truevision Targa image [*.vst] (*.vst *.VST );;Wireless Bitmap (level 0) image [*.wbmp] (*.wbmp *.WBMP );;Windows Meta File [*.wmf] (*.wmf *.WMF );;Windows WIN32 API rendered Meta File [*.wmfwin32] (*.wmfwin32 *.WMFWIN32 );;Windows Media Video [*.wmv] (*.wmv *.WMV );;Compressed Windows Meta File [*.wmz] (*.wmz *.WMZ );;Word Perfect Graphics [*.wpg] (*.wpg *.WPG );;X Image [*.x] (*.x *.X );;Sigma Camera RAW Picture File [*.x3f] (*.x3f *.X3F );;X Windows system bitmap (black and white) [*.xbm] (*.xbm *.XBM );;Constant image uniform color [*.xc] (*.xc *.XC );;GIMP image [*.xcf] (*.xcf *.XCF );;X Windows system pixmap (color) [*.xpm] (*.xpm *.XPM );;Microsoft XML Paper Specification [*.xps] (*.xps *.XPS );;Khoros Visualization image [*.xv] (*.xv *.XV );;X Windows system window dump (color) [*.xwd] (*.xwd *.XWD );;Raw yellow samples [*.y] (*.y *.Y );;Raw Y, Cb, and Cr samples [*.ycbcr] (*.ycbcr *.YCbCr );;Raw Y, Cb, Cr, and alpha samples [*.ycbcra] (*.ycbcra *.YCbCrA );;CCIR 601 4:1:1 or 4:2:2 [*.yuv] (*.yuv *.YUV ) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/Windows/WritableFormats.txt new/converseen-0.6.5/Windows/WritableFormats.txt --- old/converseen-0.6.4/Windows/WritableFormats.txt 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/Windows/WritableFormats.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -A - (Raw alpha samples) -AAI - (AAI Dune image) -AI - (Adobe Illustrator CS2) -ART - (PFS: 1st Publisher Clip Art) -AVS - (AVS X image) -B - (Raw blue samples) -BGR - (Raw blue, green, and red samples) -BGRA - (Raw blue, green, red, and alpha samples) -BIE - (Joint Bi-level Image experts Group interchange format) -BMP - (Microsoft Windows bitmap image) -C - (Raw cyan samples) -CAL - (Continuous Acquisition and Life-cycle Support Type 1) -CALS - (Continuous Acquisition and Life-cycle Support Type 1) -CIN - (Cineon Image File) -CLIPBOARD - (The system clipboard) -CMYK - (Raw cyan, magenta, yellow, and black samples) -CMYKA - (Raw cyan, magenta, yellow, black, and alpha samples) -CUR - (Microsoft icon) -DCX - (ZSoft IBM PC multi-page Paintbrush) -DPX - (SMPTE 268M-2003 (DPX 2.0)) -EPDF - (Encapsulated Portable Document Format) -EPI - (Encapsulated PostScript Interchange format) -EPS - (Encapsulated PostScript) -EPSF - (Encapsulated PostScript) -EPSI - (Encapsulated PostScript Interchange format) -EPT - (Encapsulated PostScript with TIFF preview) -EPT2 - (Encapsulated PostScript Level II with TIFF preview) -EPT3 - (Encapsulated PostScript Level III with TIFF preview) -FAX - (Group 3 FAX) -FITS - (Flexible Image Transport System) -FTS - (Flexible Image Transport System) -G - (Raw green samples) -G3 - (Group 3 FAX) -GIF - (CompuServe graphics interchange format) -GIF87 - (CompuServe graphics interchange format) -GRAY - (Raw gray samples) -GROUP4 - (Raw CCITT Group4) -HDR - (Radiance RGBE image format) -HRZ - (Slow Scan TeleVision) -ICB - (Truevision Targa image) -ICO - (Microsoft icon) -ICON - (Microsoft icon) -IPL - (IPL Image Sequence) -J2C - (JPEG-2000 Code Stream Syntax) -JBG - (Joint Bi-level Image experts Group interchange format) -JBIG - (Joint Bi-level Image experts Group interchange format) -JNG - (JPEG Network Graphics) -JP2 - (JPEG-2000 File Format Syntax) -JPC - (JPEG-2000 Code Stream Syntax) -JPEG - (Joint Photographic Experts Group JFIF format) -JPG - (Joint Photographic Experts Group JFIF format) -JPX - (JPEG-2000 File Format Syntax) -K - (Raw black samples) -M - (Raw magenta samples) -M2V - (MPEG Video Stream) -M4V - (Raw MPEG-4 Video) -MAP - (Colormap intensities and indices) -MAT - (MATLAB level 5 image format) -MIFF - (Magick Image File Format) -MNG - (Multiple-image Network Graphics) -MONO - (Raw bi-level bitmap) -MOV - (MPEG Video Stream) -MP4 - (MPEG-4 Video Stream) -MPC - (Magick Persistent Cache image format) -MPEG - (MPEG Video Stream) -MPG - (MPEG Video Stream) -MSL - (Magick Scripting Language) -MSVG - (ImageMagick's own SVG internal renderer) -MTV - (MTV Raytracing image format) -MVG - (Magick Vector Graphics) -NULL - (Constant image of uniform color) -O - (Raw opacity samples) -OTB - (On-the-air bitmap) -PAL - (16bit/pixel interleaved YUV) -PALM - (Palm pixmap) -PAM - (Common 2-dimensional bitmap format) -PBM - (Portable bitmap format (black and white)) -PCD - (Photo CD) -PCDS - (Photo CD) -PCL - (Printer Control Language) -PCT - (Apple Macintosh QuickDraw/PICT) -PCX - (ZSoft IBM PC Paintbrush) -PDB - (Palm Database ImageViewer Format) -PDF - (Portable Document Format) -PDFA - (Portable Document Archive Format) -PFM - (Portable float format) -PGM - (Portable graymap format (gray scale)) -PICON - (Personal Icon) -PICT - (Apple Macintosh QuickDraw/PICT) -PJPEG - (Joint Photographic Experts Group JFIF format) -PNG - (Portable Network Graphics) -PNG24 - (opaque 24-bit RGB) -PNG32 - (opaque or transparent 32-bit RGBA) -PNG8 - (8-bit indexed with optional binary transparency) -PNM - (Portable anymap) -PPM - (Portable pixmap format (color)) -PS - (PostScript) -PSB - (Adobe Large Document Format) -PSD - (Adobe Photoshop bitmap) -PTIF - (Pyramid encoded TIFF) -R - (Raw red samples) -RAS - (SUN Rasterfile) -RGB - (Raw red, green, and blue samples) -RGBA - (Raw red, green, blue, and alpha samples) -RGBO - (Raw red, green, blue, and opacity samples) -SGI - (Irix RGB image) -SUN - (SUN Rasterfile) -SVG - (Scalable Vector Graphics) -SVGZ - (Compressed Scalable Vector Graphics) -TEXT - (Text) -TGA - (Truevision Targa image) -TIFF - (Tagged Image File Format) -TXT - (Text) -UYVY - (16bit/pixel interleaved YUV) -VDA - (Truevision Targa image) -VICAR - (VICAR rasterfile format) -VID - (Visual Image Directory) -VIFF - (Khoros Visualization image) -VST - (Truevision Targa image) -WBMP - (Wireless Bitmap (level 0) image) -WMV - (Windows Media Video) -X - (X Image) -XBM - (X Windows system bitmap (black and white)) -XPM - (X Windows system pixmap (color)) -XV - (Khoros Visualization image) -XWD - (X Windows system window dump (color)) -Y - (Raw yellow samples) -YCbCr - (Raw Y, Cb, and Cr samples) -YCbCrA - (Raw Y, Cb, Cr, and alpha samples) -YUV - (CCIR 601 4:1:1 or 4:2:2) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/converseen.pro new/converseen-0.6.5/converseen.pro --- old/converseen-0.6.4/converseen.pro 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/converseen.pro 2013-10-28 17:29:27.000000000 +0100 @@ -69,13 +69,13 @@ loc/converseen_es_CL.ts \ loc/converseen_tr_TR.ts \ loc/converseen_ru_RU.ts \ - loc/converseen_pl_PL.ts + loc/converseen_pl_PL.ts \ RESOURCES += resources.qrc INSTALL_PREFIX = /usr target.path = $${INSTALL_PREFIX}/bin SHARE_DIR = $${INSTALL_PREFIX}/share - translations.path = $${SHARE_DIR}/converseen + translations.path = $${SHARE_DIR}/converseen/loc translations.files = loc/converseen_it_IT.qm \ loc/converseen_hu_HU.qm \ loc/converseen_cs_CZ.qm \ @@ -85,7 +85,7 @@ loc/converseen_es_CL.qm \ loc/converseen_tr_TR.qm \ loc/converseen_ru_RU.qm \ - loc/converseen_pl_PL.qm + loc/converseen_pl_PL.qm \ icon.path = $${SHARE_DIR}/pixmaps icon.files = res/converseen.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/converseen.rc new/converseen-0.6.5/converseen.rc --- old/converseen-0.6.4/converseen.rc 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/converseen.rc 2013-10-28 17:29:27.000000000 +0100 @@ -60,8 +60,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,4,0 - PRODUCTVERSION 0,6,4,0 + FILEVERSION 0,6,5,0 + PRODUCTVERSION 0,6,5,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,13 +79,13 @@ VALUE "Comments", "The batch image converter and resizer" VALUE "CompanyName", "Faster" VALUE "FileDescription", "Converseen - The batch converter and resizer" - VALUE "FileVersion", "0.6.4.0" + VALUE "FileVersion", "0.6.5.0" VALUE "InternalName", "Converseen" VALUE "LegalCopyright", "(C) 2009 - 2013 Francesco Mondello GNU - GPL" VALUE "LegalTrademarks", "(C) 2009 - 2013 Francesco Mondello GNU - GPL" VALUE "OriginalFilename", "converseen.exe" VALUE "ProductName", "Converseen" - VALUE "ProductVersion", "0.6.4.0" + VALUE "ProductVersion", "0.6.5.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/loc/converseen_si_SI.ts new/converseen-0.6.5/loc/converseen_si_SI.ts --- old/converseen-0.6.4/loc/converseen_si_SI.ts 1970-01-01 01:00:00.000000000 +0100 +++ new/converseen-0.6.5/loc/converseen_si_SI.ts 2013-10-28 17:29:27.000000000 +0100 @@ -0,0 +1,929 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="si_LK"> +<context> + <name>Converter</name> + <message> + <location filename="../src/converter.cpp" line="86"/> + <location filename="../src/converter.cpp" line="93"/> + <location filename="../src/converter.cpp" line="100"/> + <source>Error: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DialogConversionStatus</name> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="14"/> + <source>Status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="20"/> + <source>Conversion Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="46"/> + <source>Image:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="51"/> + <source>Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Total:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="81"/> + <location filename="../ui/dialogconversionstatus.ui" line="116"/> + <location filename="../ui/dialogconversionstatus.ui" line="151"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="105"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Converted:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="140"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Errors:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="191"/> + <source>Open destination </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="211"/> + <source>Stop</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogconversionstatus.ui" line="218"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/dialogconversionstatus.cpp" line="41"/> + <source>Open all the destination folders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/dialogconversionstatus.cpp" line="75"/> + <source>Converted</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DialogInfo</name> + <message> + <location filename="../ui/dialoginfo.ui" line="14"/> + <source>About Converseen...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="38"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="47"/> + <source>Informations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="53"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Author: Faster (Francesco Mondello) +Email: <a href="faster3ck(a)gmail.com">faster3ck@gmail.com</a> +Project Website: <a href="http://converseen.sourceforge.net">converseen.sourceforge.net</a> +My Homepage: <a href="http://fasterindesign.altervista.org">fasterindesign.altervista.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="83"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Translators:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="94"/> + <source>Hungarian translation: Charles Barcza - <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="101"/> + <source>Czech translation: Pavel Fric - <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="108"/> + <source>French Translation: Ludovic Troisi - <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a> +</source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/dialoginfo.ui" line="116"/> + <source>Brazilian Portuguese Translation: Márcio Moraes - <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="126"/> + <source>German Translation: Marco Nickolai - <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/dialoginfo.ui" line="133"/> + <source>Spanish (Chile) Translation: Nelson Álvarez Sáez - <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="141"/> + <source>Turkish Translation: Zeugma - <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="149"/> + <source>Russian Translation: Stasik Savorovsky - <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a></source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/dialoginfo.ui" line="156"/> + <source>Polish Translation: Michał Olber from OSWorld.pl - <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="179"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +Converseen is an image batch conversion tool. You can resize and convert images in more than 100 different formats.</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="193"/> + <source><html><head/><body>If you appreciate this work and would like to support the project, you are welcome to <a href="http://converseen.sourceforge.net/#donations">donate via Paypal</a>.</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="236"/> + <source><html><head/><body>Follow Converseen:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="306"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +(c) 2009 - 2013 Francesco Mondello GNU - GPL v.3</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialoginfo.ui" line="342"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/dialoginfo.cpp" line="39"/> + <source>The batch image converter and resizer.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DialogOptions</name> + <message> + <location filename="../ui/dialogoptions.ui" line="14"/> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="20"/> + <source>Language</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="26"/> + <source>Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="46"/> + <source>Overwriting settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="52"/> + <source>Ask first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="62"/> + <source>Overwrite all existing images</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="87"/> + <source>Ok</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogoptions.ui" line="94"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/dialogoptions.cpp" line="70"/> + <source>Warning!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/dialogoptions.cpp" line="71"/> + <source>Please, restart Converseen to apply current language!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DialogQuality</name> + <message> + <location filename="../ui/dialogquality.ui" line="14"/> + <source>Image settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="20"/> + <source>Jpeg compression level</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="28"/> + <location filename="../ui/dialogquality.ui" line="69"/> + <source>Quality 0 - 100:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="61"/> + <source>Png compression level</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="99"/> + <source>Interpolation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="107"/> + <source>Filter:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="147"/> + <source>Ok</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/dialogquality.ui" line="154"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Formats</name> + <message> + <location filename="../src/formats.cpp" line="102"/> + <source>All Supported Filters (%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/formats.cpp" line="105"/> + <source>Don't change the format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../ui/mainwindow.ui" line="32"/> + <source>Converseen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="54"/> + <source>Conversion Formats</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="62"/> + <source>Convert to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="96"/> + <source>Show image settings dialog...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="99"/> + <source>Images settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="130"/> + <source>Replace transparent background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="137"/> + <source>Choose color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="161"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="166"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="171"/> + <source>&Actions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="176"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="203"/> + <source>Actions Panel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="243"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Preview:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="351"/> + <source>Show preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="405"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Type:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="416"/> + <location filename="../ui/mainwindow.ui" line="442"/> + <location filename="../ui/mainwindow.ui" line="468"/> + <location filename="../ui/mainwindow.ui" line="494"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> + - </body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="431"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +File size:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="457"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +Image size:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="483"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +Image resolution:</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="519"/> + <source>Dimensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="537"/> + <source>Scale image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="553"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="560"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="647"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +0 x 0 pixel</body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="660"/> + <source>Mantain aspect ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="681"/> + <source>Resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="697"/> + <source>Resolution X:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="704"/> + <source>Resolution Y:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="743"/> + <location filename="../ui/mainwindow.ui" line="749"/> + <source>Rotate and flip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="764"/> + <source>Rotate image:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="773"/> + <source>No rotation</source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/mainwindow.ui" line="790"/> + <source>+ 90°</source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/mainwindow.ui" line="804"/> + <source>- 90°</source> + <translation type="unfinished"></translation> + </message> + <message utf8="true"> + <location filename="../ui/mainwindow.ui" line="820"/> + <source>180°</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="845"/> + <source>Flip image:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="854"/> + <source>No flip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="872"/> + <source>Horizontally</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="886"/> + <source>Vertically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="936"/> + <source>Output options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="948"/> + <source>Save in:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="960"/> + <source>Open output directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="963"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="974"/> + <source>Image's directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1003"/> + <source>Rename:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1012"/> + <source>Prefix/Suffix</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1022"/> + <source>Progressive Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1039"/> + <source>#_copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1046"/> + <source>Start with:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1075"/> + <source>Overwrite all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1104"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1132"/> + <source>&Open images</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1135"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1144"/> + <source>&Add images</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1147"/> + <source>Ctrl+Alt+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1156"/> + <source>&Remove images</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1159"/> + <source>Remove selected pictures</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1162"/> + <source>Del</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1171"/> + <source>Remove &all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1174"/> + <source>Remove all pictures</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1177"/> + <source>Alt+Del</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1186"/> + <source>&Check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1189"/> + <source>Check selected items</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1192"/> + <source>Ctrl+H</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1201"/> + <source>Check a&ll</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1204"/> + <source>Check all items</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1207"/> + <source>Ctrl+Alt+H</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1216"/> + <source>&Convert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1219"/> + <source>Start the conversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1222"/> + <source>F5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1227"/> + <source>&Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1230"/> + <source>Open the settings dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1235"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1238"/> + <source>Ctrl+X</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1243"/> + <source>Uncheck all &items</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1246"/> + <source>Ctrl+Alt+J</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1251"/> + <source>&Uncheck Items</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1254"/> + <source>Uncheck selected items</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1257"/> + <source>Ctrl+J</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1262"/> + <source>&About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1265"/> + <source>F1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainwindow.ui" line="1270"/> + <location filename="../ui/mainwindow.ui" line="1273"/> + <source>Donate via Paypal</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindowImpl</name> + <message> + <location filename="../src/mainwindowimpl.cpp" line="209"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="266"/> + <location filename="../src/mainwindowimpl.cpp" line="272"/> + <location filename="../src/mainwindowimpl.cpp" line="281"/> + <location filename="../src/mainwindowimpl.cpp" line="285"/> + <location filename="../src/mainwindowimpl.cpp" line="289"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="267"/> + <source>The output directory doesn't exists! Would you create it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="273"/> + <source>The directory cannot be created!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="282"/> + <source>Set an output directory!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="286"/> + <source>No image checked!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="290"/> + <source>No images to convert!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="299"/> + <source>Processing...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="462"/> + <source>Processing finished!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="516"/> + <source>Open Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="747"/> + <location filename="../src/mainwindowimpl.cpp" line="804"/> + <source>Preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="844"/> + <source>Suggest a new name!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="845"/> + <source>New name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="850"/> + <source>Please, specify a name!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="851"/> + <source>You should specify a name. +Click Retry to specify a new name. +Click Ignore to cancel this operation. +Click Abort to cancel all operations.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="866"/> + <location filename="../src/mainwindowimpl.cpp" line="871"/> + <source>Warning!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="867"/> + <source>The filename should not be empty!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="872"/> + <source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mainwindowimpl.cpp" line="888"/> + <source>Aborted!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PixTreeWidget</name> + <message> + <location filename="../src/pixtreewidget.cpp" line="39"/> + <source>To convert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pixtreewidget.cpp" line="40"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pixtreewidget.cpp" line="41"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pixtreewidget.cpp" line="42"/> + <source>Image type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pixtreewidget.cpp" line="43"/> + <source>File size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pixtreewidget.cpp" line="44"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Translator</name> + <message> + <location filename="../src/translator.cpp" line="80"/> + <location filename="../src/translator.cpp" line="93"/> + <source>English</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>myLabelPreviewer</name> + <message> + <location filename="../src/mylabelpreviewer.cpp" line="50"/> + <source>Preview</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/dialogoptions.cpp new/converseen-0.6.5/src/dialogoptions.cpp --- old/converseen-0.6.4/src/dialogoptions.cpp 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/dialogoptions.cpp 2013-10-28 17:29:27.000000000 +0100 @@ -24,6 +24,7 @@ #include <QMessageBox> #include "dialogoptions.h" #include "translator.h" +#include <QDebug> #define INIFILENAME ".converseen.conf" @@ -101,6 +102,9 @@ } Translator t; + + qDebug() << "Lingua corrente " << t.currentLanguage(); + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); comboLangs->setCurrentIndex(idx); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/formats.cpp new/converseen-0.6.5/src/formats.cpp --- old/converseen-0.6.4/src/formats.cpp 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/formats.cpp 2013-10-28 17:29:27.000000000 +0100 @@ -35,27 +35,7 @@ void Formats::loadFormats() { - -#ifdef Q_OS_WIN32 - QFile data1("Windows\\Readableformats.txt"); - if (data1.open(QFile::ReadOnly)) { - QTextStream in(&data1); - - s_readableFilters = in.readLine().split(" "); - s_readableFiltersString = in.readLine(); - } - - QFile data2("Windows\\WritableFormats.txt"); - if (data2.open(QFile::ReadOnly)) { - QTextStream in(&data2); - QString line; - do { - line = in.readLine(); - s_writableFilters << line; - } while (!line.isNull()); - } - s_writableFilters.removeLast(); -#else +#ifdef Q_OS_LINUX list<CoderInfo> coderList; coderInfoList(&coderList, CoderInfo::TrueMatch, @@ -100,6 +80,25 @@ s_readableFiltersString = readableFiltersList.join(""); s_readableFiltersString.prepend(tr("All Supported Filters (%1)").arg(readableExts)); +#else + QFile data1(QDir::cleanPath("FileFormats/Readableformats.txt")); + if (data1.open(QFile::ReadOnly)) { + QTextStream in(&data1); + + s_readableFilters = in.readLine().split(" "); + s_readableFiltersString = in.readLine(); + } + + QFile data2(QDir::cleanPath("FileFormats/WritableFormats.txt")); + if (data2.open(QFile::ReadOnly)) { + QTextStream in(&data2); + QString line; + do { + line = in.readLine(); + s_writableFilters << line; + } while (!line.isNull()); + } + s_writableFilters.removeLast(); #endif s_writableFilters.prepend(tr("Don't change the format")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/formats.h new/converseen-0.6.5/src/formats.h --- old/converseen-0.6.4/src/formats.h 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/formats.h 2013-10-28 17:29:27.000000000 +0100 @@ -28,6 +28,7 @@ #include <QStringList> #include <QObject> #include <QMap> +#include <QDir> #include <Magick++.h> #include <string> #include <iostream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/main.cpp new/converseen-0.6.5/src/main.cpp --- old/converseen-0.6.4/src/main.cpp 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/main.cpp 2013-10-28 17:29:27.000000000 +0100 @@ -24,10 +24,11 @@ #include <QApplication> #include <QTextCodec> #include <Magick++.h> +#include <QDebug> #include "mainwindowimpl.h" #include "translator.h" -#define VERSION "0.6.4" +#define VERSION "0.6.5" int main(int argc, char ** argv) { @@ -51,6 +52,11 @@ win.importListFromArgv(QString::fromStdString(argv[2])); } } + else { + for (int i = 0; i < argc; i++) { + qDebug() << "File " << argv[i]; + } + } win.show(); app.connect( &app, SIGNAL( lastWindowClosed() ), &app, SLOT( quit() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/translator.cpp new/converseen-0.6.5/src/translator.cpp --- old/converseen-0.6.4/src/translator.cpp 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/translator.cpp 2013-10-28 17:29:27.000000000 +0100 @@ -44,12 +44,18 @@ #endif settings = new QSettings(iniPath, QSettings::IniFormat); + +#ifdef Q_OS_LINUX + m_loc = QString("%1/converseen/loc").arg(dataDir); +#else + m_loc = QString("%1/loc").arg(dataDir); +#endif } QTranslator *Translator::translation() { QTranslator *transl = new QTranslator; - QString translationFile = QString("%1/converseen/"+loadCurrentTranslationName()).arg(dataDir); + QString translationFile = QString("%1/%2").arg(m_loc).arg(loadCurrentTranslationName()); transl->load(translationFile); return(transl); @@ -80,7 +86,7 @@ language = tr("English"); QTranslator transl; - QDir trPath(QString("%1/converseen").arg(dataDir)); + QDir trPath(m_loc); QStringList fileNames = trPath.entryList(QStringList() << "*.qm", QDir::Files, QDir::Name); QList<QPair<QString, QString> > langsList; @@ -89,7 +95,7 @@ for (int i = 0; i < fileNames.count(); i++) { lang.first = fileNames.at(i); - transl.load(fileNames.at(i), QString("%1/converseen").arg(dataDir)); + transl.load(fileNames.at(i), m_loc); lang.second = transl.translate("Translator", "English"); langsList << lang; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/translator.h new/converseen-0.6.5/src/translator.h --- old/converseen-0.6.4/src/translator.h 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/translator.h 2013-10-28 17:29:27.000000000 +0100 @@ -41,6 +41,7 @@ QString loadCurrentTranslationName(); private: QSettings *settings; + QString m_loc; }; #endif // __TRANSLATOR_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.6.4/src/whereiam.cpp new/converseen-0.6.5/src/whereiam.cpp --- old/converseen-0.6.4/src/whereiam.cpp 2013-07-23 01:04:34.000000000 +0200 +++ new/converseen-0.6.5/src/whereiam.cpp 2013-10-28 17:29:27.000000000 +0100 @@ -35,13 +35,13 @@ QString dataDir = binDir; #ifdef Q_OS_LINUX - if (binDir == QDir::cleanPath ("/usr/bin")) // If linux /usr installed + if (binDir == QDir::cleanPath("/usr/bin")) // If linux /usr installed dataDir = "/usr/share/"; else if (binDir == "/usr/local/bin") dataDir = "/usr/local/share/"; // If linux /usr/local installed #else // Windows, Haiku etc... - dataDir = dataDir + "\\"; + dataDir = QDir::cleanPath(dataDir + "/"); #endif return(dataDir); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strongswan 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 strongswan for openSUSE:13.1 checked in at 2013-11-04 09:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/strongswan (Old) and /work/SRC/openSUSE:13.1/.strongswan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "strongswan" Changes: -------- --- /work/SRC/openSUSE:13.1/strongswan/strongswan.changes 2013-09-23 11:09:41.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.strongswan.new/strongswan.changes 2013-11-04 09:31:59.000000000 +0100 @@ -1,0 +2,63 @@ +Fri Nov 1 12:28:39 UTC 2013 - mt(a)suse.de + +- Updated to strongSwan 5.1.1 minor release addressing two security + fixes (bnc#847506,CVE-2013-6075, bnc#847509,CVE-2013-6076): + - Fixed a denial-of-service vulnerability and potential authorization + bypass triggered by a crafted ID_DER_ASN1_DN ID payload. The cause + is an insufficient length check when comparing such identities. The + vulnerability has been registered as CVE-2013-6075. + - Fixed a denial-of-service vulnerability triggered by a crafted IKEv1 + fragmentation payload. The cause is a NULL pointer dereference. The + vulnerability has been registered as CVE-2013-6076. + - The lean stand-alone pt-tls-client can set up a RFC 6876 PT-TLS + session with a strongSwan policy enforcement point which uses the + tnc-pdp charon plugin. + - The new TCG TNC SWID IMC/IMV pair supports targeted SWID requests + for either full SWID Tag or concise SWID Tag ID inventories. + - The XAuth backend in eap-radius now supports multiple XAuth + exchanges for different credential types and display messages. + All user input gets concatenated and verified with a single + User-Password RADIUS attribute on the AAA. With an AAA supporting + it, one for example can implement Password+Token authentication with + proper dialogs on iOS and OS X clients. - charon supports IKEv1 Mode + Config exchange in push mode. The ipsec.conf modeconfig=push option + enables it for both client and server, the same way as pluto used it. + - Using the "ah" ipsec.conf keyword on both IKEv1 and IKEv2 + connections, charon can negotiate and install Security Associations + integrity-protected by the Authentication Header protocol. Supported + are plain AH(+IPComp) SAs only, but not the deprecated RFC2401 style + ESP+AH bundles. + - The generation of initialization vectors for IKE and ESP (when using + libipsec) is now modularized and IVs for e.g. AES-GCM are now correctly + allocated sequentially, while other algorithms like AES-CBC still + use random IVs. + - The left and right options in ipsec.conf can take multiple address + ranges and subnets. This allows connection matching against a larger + set of addresses, for example to use a different connection for clients + connecting from a internal network. + - For all those who have a queasy feeling about the NIST elliptic curve + set, the Brainpool curves introduced for use with IKE by RFC 6932 might + be a more trustworthy alternative. + - The kernel-libipsec userland IPsec backend now supports usage + statistics, volume based rekeying and accepts ESPv3 style TFC padded + packets. + - With two new strongswan.conf options fwmarks can be used to implement + host-to-host tunnels with kernel-libipsec. + - load-tester supports transport mode connections and more complex + traffic selectors, including such using unique ports for each tunnel. + - The new dnscert plugin provides support for authentication via CERT + RRs that are protected via DNSSEC. The plugin was created by Ruslan + N. Marchenko. + - The eap-radius plugin supports forwarding of several Cisco Unity + specific RADIUS attributes in corresponding configuration payloads. + - Database transactions are now abstracted and implemented by the two + backends. If you use MySQL make sure all tables use the InnoDB engine. + - libstrongswan now can provide an experimental custom implementation + of the printf family functions based on klibc if neither Vstr nor + glibc style printf hooks are available. This can avoid the Vstr + dependency on some systems at the cost of slower and less complete + printf functions. +- Adjusted file lists: this version installs the pki utility and manuals + in common /usr directories and additional ipsec/pt-tls-client helper. + +------------------------------------------------------------------- Old: ---- strongswan-5.1.0-rpmlintrc strongswan-5.1.0.tar.bz2 strongswan-5.1.0.tar.bz2.sig New: ---- strongswan-5.1.1-rpmlintrc strongswan-5.1.1.tar.bz2 strongswan-5.1.1.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strongswan.spec ++++++ --- /var/tmp/diff_new_pack.V28nS3/_old 2013-11-04 09:31:59.000000000 +0100 +++ /var/tmp/diff_new_pack.V28nS3/_new 2013-11-04 09:31:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: strongswan -Version: 5.1.0 +Version: 5.1.1 Release: 0 %define upstream_version %{version} %define strongswan_docdir %{_docdir}/%{name} @@ -421,7 +421,9 @@ %config %{_sysconfdir}/init.d/ipsec %{_sbindir}/rcipsec %endif +%{_bindir}/pki %{_sbindir}/ipsec +%{_mandir}/man1/pki*.1* %{_mandir}/man8/ipsec.8* %{_mandir}/man5/ipsec.conf.5* %{_mandir}/man5/ipsec.secrets.5* @@ -433,8 +435,8 @@ %{_libexecdir}/ipsec/conftest %{_libexecdir}/ipsec/duplicheck %{_libexecdir}/ipsec/openac -%{_libexecdir}/ipsec/pki %{_libexecdir}/ipsec/pool +%{_libexecdir}/ipsec/pt-tls-client %{_libexecdir}/ipsec/scepclient %{_libexecdir}/ipsec/starter %{_libexecdir}/ipsec/stroke ++++++ strongswan-5.1.0-rpmlintrc -> strongswan-5.1.1-rpmlintrc ++++++ ++++++ strongswan-5.1.0.tar.bz2 -> strongswan-5.1.1.tar.bz2 ++++++ ++++ 172689 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 python3-qt5 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 python3-qt5 for openSUSE:Factory checked in at 2013-11-04 09:24:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-qt5 (Old) and /work/SRC/openSUSE:Factory/.python3-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-qt5" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="python-qt5" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtxmlpatterns 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 libqt5-qtxmlpatterns for openSUSE:Factory checked in at 2013-11-04 09:24:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtxmlpatterns" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns/libqt5-qtxmlpatterns.changes 2013-10-04 13:55:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new/libqt5-qtxmlpatterns.changes 2013-11-04 09:24:06.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + +------------------------------------------------------------------- Old: ---- qtxmlpatterns-opensource-src-5.1.1.tar.xz New: ---- qtxmlpatterns-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtxmlpatterns.spec ++++++ --- /var/tmp/diff_new_pack.ZH8d9S/_old 2013-11-04 09:24:07.000000000 +0100 +++ /var/tmp/diff_new_pack.ZH8d9S/_new 2013-11-04 09:24:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtxmlpatterns # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define libname libQt5XmlPatterns5 Name: libqt5-qtxmlpatterns -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 -License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt 5 XmlPatterns Library -Url: http://qt.digia.com +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: System/Libraries +Url: http://qt.digia.com Source: %{tar_version}.tar.xz %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtxmlpatterns-opensource-src-%{real_version} BuildRequires: libqt5-qtbase-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} @@ -80,18 +81,11 @@ %postun -n %libname -p /sbin/ldconfig %build -export PATH=%{_libqt5_bindir}:$PATH -%ifarch ppc64 - RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export MAKEFLAGS="%{?_smp_mflags}" -qmake -make +%qmake5 +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install +%qmake5_install # put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir mkdir %{buildroot}%{_bindir} @@ -103,9 +97,6 @@ done popd -%clean -rm -rf %{buildroot} - %files -n %libname %defattr(-,root,root,755) %{_bindir}/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtx11extras 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 libqt5-qtx11extras for openSUSE:Factory checked in at 2013-11-04 09:24:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtx11extras" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes 2013-10-01 08:15:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes 2013-11-04 09:24:02.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + +------------------------------------------------------------------- Old: ---- qtx11extras-opensource-src-5.1.0.tar.xz New: ---- qtx11extras-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtx11extras.spec ++++++ --- /var/tmp/diff_new_pack.QAvuOo/_old 2013-11-04 09:24:03.000000000 +0100 +++ /var/tmp/diff_new_pack.QAvuOo/_new 2013-11-04 09:24:03.000000000 +0100 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define libname libQt5X11Extras5 Name: libqt5-qtx11extras BuildRequires: fdupes -Version: 5.1.0 +Version: 5.2.0~beta1 Release: 0 %define base_name libqt5 -%define real_version 5.1.0 -%define so_version 5.1.0 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtx11extras-opensource-src-%{real_version} -BuildRequires: libqt5-qtbase-private-headers-devel +BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: xz Url: http://qt.digia.com Summary: Qt 5 X11 Extras Addon @@ -34,7 +35,6 @@ Source: %{tar_version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description Qt is a set of libraries for developing applications. @@ -60,7 +60,7 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %version -Requires: libqt5-qtbase-private-headers-devel +Requires: libqt5-qtbase-private-headers-devel >= %{version} %description -n libQt5X11Extras-devel You need this package, if you want to compile programs with qtx11extras. @@ -70,21 +70,11 @@ %postun -n %libname -p /sbin/ldconfig %build -export PATH=%_libqt5_bindir:$PATH -%ifarch ppc64 - RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" -%endif -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export MAKEFLAGS="%{?jobs:-j %jobs}" -qmake -make +%qmake5 +%make_jobs %install -make INSTALL_ROOT=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT +%qmake5_install %files -n %libname %defattr(-,root,root,755) @@ -99,3 +89,5 @@ %{_libqt5_libdir}/libQt5X11Extras.so %{_libqt5_libdir}/pkgconfig/Qt5X11Extras.pc %{_libqt5_archdatadir}/mkspecs/modules/qt_lib_x11extras.pri + +%changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtwebkit-examples 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 libqt5-qtwebkit-examples for openSUSE:Factory checked in at 2013-11-04 09:22:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit-examples (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit-examples.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebkit-examples" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit-examples/libqt5-qtwebkit-examples.changes 2013-10-04 13:55:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit-examples.new/libqt5-qtwebkit-examples.changes 2013-11-04 09:22:11.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + +------------------------------------------------------------------- Old: ---- qtwebkit-examples-opensource-src-5.1.1.tar.xz New: ---- qtwebkit-examples-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit-examples.spec ++++++ --- /var/tmp/diff_new_pack.nZy3H4/_old 2013-11-04 09:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.nZy3H4/_new 2013-11-04 09:22:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebkit-examples # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,19 @@ Name: libqt5-qtwebkit-examples -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 -License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt 5 QtWebKit Examples and Demos -Url: http://qt.digia.com +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 +Url: http://qt.digia.com Source: %{tar_version}.tar.xz # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: build-examples.diff # to get mtime of file: Source1: libqt5-qtwebkit-examples.changes %define base_name libqt5 -%define real_version 5.1.1 +%define real_version 5.2.0-beta1 %define tar_version qtwebkit-examples-opensource-src-%{real_version} BuildRequires: libqt5-qttools-devel >= %{version} BuildRequires: xz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtwebkit 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 libqt5-qtwebkit for openSUSE:Factory checked in at 2013-11-04 09:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2013-10-17 17:41:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2013-11-04 09:18:16.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 +- Droped bison3.patch, included in this release + +------------------------------------------------------------------- +Fri Oct 18 12:16:15 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Added 03_hide_std_symbols.diff, 04_enable_debug_information.diff, + aarch64-support.patch and reduce-link-optimization.diff -- those + resolve linking/build failures on arm/aarch64 + +------------------------------------------------------------------- Old: ---- bison3.patch qtwebkit-opensource-src-5.1.1.tar.xz New: ---- 03_hide_std_symbols.diff 04_enable_debug_information.diff aarch64-support.patch qtwebkit-opensource-src-5.2.0-beta1.tar.xz reduce-link-optimization.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.zR3Zww/_old 2013-11-04 09:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.zR3Zww/_new 2013-11-04 09:18:19.000000000 +0100 @@ -19,12 +19,15 @@ %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 BuildRequires: libQt5Quick-private-headers-devel >= %{version} +BuildRequires: pkgconfig(Qt5Multimedia) >= %{version} +BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) >= %{version} %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtwebkit-opensource-src-%{real_version} BuildRequires: libQt5Script-devel >= %{version} %if 0%{?suse_version} < 1320 @@ -48,8 +51,12 @@ Group: Development/Libraries/X11 Url: http://qt.digia.com Source: %{tar_version}.tar.xz -# PATCH-FIX-UPSTREAM bison3.patch -- fixes build with bison3 -Patch0: bison3.patch +Patch1: 04_enable_debug_information.diff +# PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff asterios.dramis(a)gmail.com -- Do not make the std:: symbols in webkit public (taken from Ubuntu) +Patch2: 03_hide_std_symbols.diff +Patch3: reduce-link-optimization.diff +# PATCH-FIX-UPSTREAM aarch64-support.diff schwab(a)suse.de -- add support for aarch64 +Patch4: aarch64-support.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff BuildRequires: bison @@ -61,6 +68,7 @@ BuildRequires: python-xml BuildRequires: ruby BuildRequires: xz +BuildRequires: pkgconfig(libwebp) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,7 +80,10 @@ %prep %setup -q -n qtwebkit-opensource-src-%{real_version} -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %patch130 -p1 %package -n %libname @@ -109,9 +120,10 @@ Group: Development/Libraries/X11 Requires: libQt5Quick-private-headers-devel >= %{version} Requires: libQt5Script-devel >= %{version} -Requires: libQt5WebKit5 = %{version} +Requires: libQt5WebKit5 = %version Requires: libicu-devel Requires: libxslt-devel +Requires: pkgconfig(libwebp) %if 0%{?suse_version} < 1320 Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-app-0.10) @@ -172,9 +184,13 @@ %ifarch ppc64 RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory" +# runs out of memory otherwise +%ifarch %arm aarch64 +export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / /} +%endif +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" qmake make ++++++ 03_hide_std_symbols.diff ++++++ From: Modestas Vainius <modax(a)debian.org> SUbject: Make hide_symbols to cover all QtWebKit portions Origin: vendor Author: Timo Jyrinki <timo(a)debian.org> Last-Update: 2013-01-28 (use a similar patch on Qt 5) Forwarded: no Almost everything in Source/WebCore/generated was not build with -fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol list in libQtWebKit.so. Therefore, move +hide_symbols configuration parameter upwards in order for it to cover everything including the offending Source/WebCore/CodeGenerators.pri --- a/Source/QtWebKit.pro 2012-12-18 19:04:43.000000000 +0000 +++ b/Source/QtWebKit.pro 2013-01-28 08:25:56.342911517 +0000 @@ -7,6 +7,11 @@ TEMPLATE = subdirs CONFIG += ordered +CONFIG(release):!CONFIG(standalone_package) { + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +} + api.file = api.pri SUBDIRS += api ++++++ 04_enable_debug_information.diff ++++++ --- a/Source/WebKit/WebKit1.pri +++ b/Source/WebKit/WebKit1.pri @@ -7,6 +7,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit +equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) { + message("s390, armel, armhf, mipsel, i386 workaround for QtWebkit: do not build with -g, but with -gstabs") + QMAKE_CXXFLAGS -= -g + QMAKE_CXXFLAGS += -gstabs +} + INCLUDEPATH += \ $$SOURCE_DIR/qt/Api \ $$SOURCE_DIR/qt/WebCoreSupport \ --- a/Source/WebKit2/WebKit2.pri +++ b/Source/WebKit2/WebKit2.pri @@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} +equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) { + message("s390, armel, armhf, mipsel, i686 workaround for QtWebkit: do not build with -g, but with -gstabs") + QMAKE_CXXFLAGS -= -g + QMAKE_CXXFLAGS += -gstabs +} + INCLUDEPATH += \ $$SOURCE_DIR \ $$SOURCE_DIR/Platform \ ++++++ aarch64-support.patch ++++++ Index: webkitgtk-2.0.1/Source/WTF/wtf/Platform.h =================================================================== --- webkitgtk-2.0.1.orig/Source/WTF/wtf/Platform.h +++ webkitgtk-2.0.1/Source/WTF/wtf/Platform.h @@ -318,6 +318,14 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif +/* CPU(AARCH64) - AArch64 */ +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 +#if defined(__AARCH64BE__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -744,7 +752,8 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ - || CPU(PPC64) + || CPU(PPC64) \ + || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 Index: webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h =================================================================== --- webkitgtk-2.0.1.orig/Source/WTF/wtf/dtoa/utils.h +++ webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h @@ -49,7 +49,7 @@ defined(__ARMEL__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) +#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) ++++++ no-Werror-rpath.diff ++++++ --- /var/tmp/diff_new_pack.zR3Zww/_old 2013-11-04 09:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.zR3Zww/_new 2013-11-04 09:18:19.000000000 +0100 @@ -1,15 +1,16 @@ ---- qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 19:59:43 1.1 -+++ qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 20:00:17 -@@ -15,7 +15,7 @@ +diff -Naur qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf +--- qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-22 10:49:32.000000000 +0200 ++++ qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-24 03:21:13.236166006 +0200 +@@ -19,7 +19,7 @@ linux-*g++* { !production_build { # Treat warnings as errors on x86/Linux/GCC - isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+# isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror ++ #isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror } - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) { -@@ -32,7 +32,7 @@ + } + +@@ -39,7 +39,7 @@ QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } ++++++ reduce-link-optimization.diff ++++++ Index: webkit-qtwebkit-23/Source/WebCore/WebCore.pri =================================================================== --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -345,6 +345,8 @@ mac { unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qttools 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 libqt5-qttools for openSUSE:Factory checked in at 2013-11-04 09:18:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qttools" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2013-10-18 11:40:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new/libqt5-qttools.changes 2013-11-04 09:18:07.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + +------------------------------------------------------------------- Old: ---- qttools-opensource-src-5.1.1.tar.xz New: ---- qttools-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttools.spec ++++++ --- /var/tmp/diff_new_pack.MHaMk0/_old 2013-11-04 09:18:10.000000000 +0100 +++ /var/tmp/diff_new_pack.MHaMk0/_new 2013-11-04 09:18:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: libqt5-qttools -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 Summary: Qt 5 QtTools Module License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 @@ -32,8 +32,8 @@ Source16: linguist5.png BuildRequires: fdupes %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qttools-opensource-src-%{real_version} BuildRequires: libQt5Quick-private-headers-devel >= %{version} BuildRequires: libQt5WebKitWidgets-devel >= %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtsvg 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 libqt5-qtsvg for openSUSE:Factory checked in at 2013-11-04 09:17:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtsvg" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2013-10-04 13:54:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new/libqt5-qtsvg.changes 2013-11-04 09:18:01.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + +------------------------------------------------------------------- Old: ---- qtsvg-opensource-src-5.1.1.tar.xz New: ---- qtsvg-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtsvg.spec ++++++ --- /var/tmp/diff_new_pack.wbLumO/_old 2013-11-04 09:18:01.000000000 +0100 +++ /var/tmp/diff_new_pack.wbLumO/_new 2013-11-04 09:18:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtsvg # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ %define libname libQt5Svg5 Name: libqt5-qtsvg -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 -License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt 5 SVG Library -Url: http://qt.digia.com +License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 +Url: http://qt.digia.com Source: %{tar_version}.tar.xz %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtsvg-opensource-src-%{real_version} BuildRequires: libqt5-qtbase-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} @@ -80,21 +80,11 @@ %postun -n %libname -p /sbin/ldconfig %build -export PATH=%_libqt5_bindir:$PATH -%ifarch ppc64 - RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export MAKEFLAGS="%{?_smp_mflags}" -qmake -make +%qmake5 +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install - -%clean -rm -rf %{buildroot} +%qmake5_install %files -n %libname %defattr(-,root,root,755) @@ -111,7 +101,7 @@ %{_libqt5_includedir}/QtSvg %exclude %{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/QtSvg -%{_libqt5_libdir}/cmake/Qt5Svg +%{_libqt5_libdir}/cmake/Qt5* %{_libqt5_libdir}/libQt5Svg.la %{_libqt5_libdir}/libQt5Svg.prl %{_libqt5_libdir}/libQt5Svg.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0