April 2018 - openSUSE Commits - openSUSE Mailing Lists

commit bovo for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package bovo for openSUSE:Factory checked in at 2018-04-27 16:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bovo (Old) and /work/SRC/openSUSE:Factory/.bovo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bovo" Fri Apr 27 16:01:37 2018 rev:72 rq:598975 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bovo/bovo.changes 2018-03-22 11:59:17.086221408 +0100 +++ /work/SRC/openSUSE:Factory/.bovo.new/bovo.changes 2018-04-27 16:01:40.795113402 +0200 @@ -1,0 +2,20 @@ +Wed Apr 18 07:48:35 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:43 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * None + +------------------------------------------------------------------- Old: ---- bovo-17.12.3.tar.xz New: ---- bovo-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bovo.spec ++++++ --- /var/tmp/diff_new_pack.IT9l6g/_old 2018-04-27 16:01:41.519086833 +0200 +++ /var/tmp/diff_new_pack.IT9l6g/_new 2018-04-27 16:01:41.519086833 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: bovo -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ bovo-17.12.3.tar.xz -> bovo-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-17.12.3/org.kde.bovo.appdata.xml new/bovo-18.04.0/org.kde.bovo.appdata.xml --- old/bovo-17.12.3/org.kde.bovo.appdata.xml 2018-02-08 05:50:17.000000000 +0100 +++ new/bovo-18.04.0/org.kde.bovo.appdata.xml 2018-03-13 03:22:24.000000000 +0100 @@ -75,7 +75,7 @@ Bovo je Gomoku (od japanskog 五目並べ - lit. "pet poena") slična igra za dva igrača, gdje se protivnici smjenjuju u stavljanju svog dijela piktograma na tabli. (Poznat i kao: poveži pet, pet u nizu, X i O, križić i kružić) El Bovo és un joc semblant al Gomoku (del japonès 五目並べ - lit. «cinc punts») per a dos jugadors, a on els oponents situen els seus ideogrames respectius alternativament en el tauler de joc. També conegut com a: Connecta cinc, Cinc en fila, X i O, Zeros i creus. - El Bovo és un joc paregut al Gomoku (del japonés 五目並べ - lit. «cinc punts») per a dos jugadors, a on els oponents situen els seus ideogrames respectius alternativament en el tauler de joc. També conegut com a: Connecta cinc, Cinc en fila, X i O, Zeros i creus. + El Bovo és un joc semblant al Gomoku (del japonés 五目並べ - lit. «cinc punts») per a dos jugadors, a on els oponents situen els seus ideogrames respectius alternativament en el tauler de joc. També conegut com a: Connecta cinc, Cinc en fila, X i O, Zeros i creus. Bovo ist ein Gomoku (aus dem japanischen wörtlich „Fünf Punkte“) ähnliches Spiel für zwei Spieler, bei dem die Gegner abwechselnd ihre jeweiligen Piktogramme auf dem Brett platzieren. Auch bekannt als: Fünf verbinden, Fünf in einer Reihe, X und O, Nullen und Kreuze Το Bovo είναι ένα είδος παιχνιδιού Gomoku (στα Ιαπωνικά 五目並べ - κυρ. "πέντε πόντοι" για δύο παίκτες, στο οποίο οι αντίπαλοι τοποθετούν εναλλάξ ο καθένας το δικό του πικτόγραμμα στον πίνακα του παιχνιδιού. (Είναι επίσης γνωστό ως Σύνδεσε πέντε, Πέντε στη γραμμή, Χ και Ο, κύκλοι και σταυροί) Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-17.12.3/po/ca/bovo.po new/bovo-18.04.0/po/ca/bovo.po --- old/bovo-17.12.3/po/ca/bovo.po 2018-03-06 01:18:43.000000000 +0100 +++ new/bovo-18.04.0/po/ca/bovo.po 2018-04-13 02:08:31.000000000 +0200 @@ -151,3 +151,6 @@ #, kde-format msgid "Game replayed." msgstr "S'ha acabat la repetició de la partida." + +#~ msgid "Difficulty level: strength of the computer player." +#~ msgstr "Nivell de dificultat: destresa del jugador ordinador." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-17.12.3/po/ca(a)valencia/bovo.po new/bovo-18.04.0/po/ca(a)valencia/bovo.po --- old/bovo-17.12.3/po/ca(a)valencia/bovo.po 2018-03-06 01:18:43.000000000 +0100 +++ new/bovo-18.04.0/po/ca(a)valencia/bovo.po 2018-04-13 02:08:31.000000000 +0200 @@ -151,3 +151,6 @@ #, kde-format msgid "Game replayed." msgstr "S'ha acabat la repetició de la partida." + +#~ msgid "Difficulty level: strength of the computer player." +#~ msgstr "Nivell de dificultat: destresa del jugador ordinador." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-17.12.3/po/zh_CN/bovo.po new/bovo-18.04.0/po/zh_CN/bovo.po --- old/bovo-17.12.3/po/zh_CN/bovo.po 2018-03-06 01:18:44.000000000 +0100 +++ new/bovo-18.04.0/po/zh_CN/bovo.po 2018-04-13 02:08:31.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:14+0100\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"PO-Revision-Date: 2018-04-05 09:40-0400\n" "Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"

1 0

commit bomber for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package bomber for openSUSE:Factory checked in at 2018-04-27 16:01:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bomber (Old) and /work/SRC/openSUSE:Factory/.bomber.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bomber" Fri Apr 27 16:01:33 2018 rev:72 rq:598974 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bomber/bomber.changes 2018-03-22 11:59:14.330320232 +0100 +++ /work/SRC/openSUSE:Factory/.bomber.new/bomber.changes 2018-04-27 16:01:38.139210869 +0200 @@ -1,0 +2,20 @@ +Wed Apr 18 07:48:35 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:43 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * None + +------------------------------------------------------------------- Old: ---- bomber-17.12.3.tar.xz New: ---- bomber-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bomber.spec ++++++ --- /var/tmp/diff_new_pack.73dibr/_old 2018-04-27 16:01:40.379128668 +0200 +++ /var/tmp/diff_new_pack.73dibr/_new 2018-04-27 16:01:40.383128521 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: bomber -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ bomber-17.12.3.tar.xz -> bomber-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bomber-17.12.3/po/ca/bomber.po new/bomber-18.04.0/po/ca/bomber.po --- old/bomber-17.12.3/po/ca/bomber.po 2018-03-06 01:18:39.000000000 +0100 +++ new/bomber-18.04.0/po/ca/bomber.po 2018-04-13 02:08:28.000000000 +0200 @@ -181,3 +181,9 @@ #, kde-format msgid "Porting to QGraphicsView." msgstr "Adaptació al QGraphicsView." + +#~ msgid "The graphical theme to be used." +#~ msgstr "Tema gràfic que s'utilitzarà." + +#~ msgid "Theme" +#~ msgstr "Tema" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bomber-17.12.3/po/ca(a)valencia/bomber.po new/bomber-18.04.0/po/ca(a)valencia/bomber.po --- old/bomber-17.12.3/po/ca(a)valencia/bomber.po 2018-03-06 01:18:39.000000000 +0100 +++ new/bomber-18.04.0/po/ca(a)valencia/bomber.po 2018-04-13 02:08:28.000000000 +0200 @@ -181,3 +181,9 @@ #, kde-format msgid "Porting to QGraphicsView." msgstr "Adaptació al QGraphicsView." + +#~ msgid "The graphical theme to be used." +#~ msgstr "Tema gràfic que s'utilitzarà." + +#~ msgid "Theme" +#~ msgstr "Tema" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bomber-17.12.3/po/zh_CN/bomber.po new/bomber-18.04.0/po/zh_CN/bomber.po --- old/bomber-17.12.3/po/zh_CN/bomber.po 2018-03-06 01:18:39.000000000 +0100 +++ new/bomber-18.04.0/po/zh_CN/bomber.po 2018-04-13 02:08:29.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:14+0100\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"PO-Revision-Date: 2018-04-05 09:40-0400\n" "Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"

1 0

commit blinken for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package blinken for openSUSE:Factory checked in at 2018-04-27 16:01:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blinken (Old) and /work/SRC/openSUSE:Factory/.blinken.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blinken" Fri Apr 27 16:01:31 2018 rev:93 rq:598973 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blinken/blinken.changes 2018-03-22 11:59:11.278429669 +0100 +++ /work/SRC/openSUSE:Factory/.blinken.new/blinken.changes 2018-04-27 16:01:33.431383639 +0200 @@ -1,0 +2,20 @@ +Wed Apr 18 07:48:35 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:42 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * Mark Phonon as a required module in CMake + +------------------------------------------------------------------- Old: ---- blinken-17.12.3.tar.xz New: ---- blinken-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blinken.spec ++++++ --- /var/tmp/diff_new_pack.cVweOY/_old 2018-04-27 16:01:34.295351933 +0200 +++ /var/tmp/diff_new_pack.cVweOY/_new 2018-04-27 16:01:34.295351933 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: blinken -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ blinken-17.12.3.tar.xz -> blinken-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-17.12.3/CMakeLists.txt new/blinken-18.04.0/CMakeLists.txt --- old/blinken-17.12.3/CMakeLists.txt 2018-03-06 01:08:57.000000000 +0100 +++ new/blinken-18.04.0/CMakeLists.txt 2018-04-13 02:02:34.000000000 +0200 @@ -17,7 +17,7 @@ I18n XmlGui GuiAddons DocTools DBusAddons Crash ) -find_package (Phonon4Qt5) +find_package (Phonon4Qt5 REQUIRED) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-17.12.3/org.kde.blinken.appdata.xml new/blinken-18.04.0/org.kde.blinken.appdata.xml --- old/blinken-17.12.3/org.kde.blinken.appdata.xml 2017-12-22 05:41:45.000000000 +0100 +++ new/blinken-18.04.0/org.kde.blinken.appdata.xml 2018-03-26 00:02:59.000000000 +0200 @@ -70,7 +70,7 @@ Blinken is based on an electronic game released in 1978, which challenges players to remember sequences of increasing length. On the face of the device, there are 4 different color buttons, each one with their own distinctive sound. These buttons light up randomly, creating the sequence that the player must then recall. If the player is successful in remembering the sequence of lights in the correct order, they advance to the next stage, where an identical sequence with one extra step is presented. If they are incorrect, the game is lost, and the player must start again from the beginning. The goal is to get a high score - each step in the sequence is worth one point, so correct entry of a sequence of 8 lights is worth 8 points on the high score table. Blinken je zasnovan na elektronskoj igri objavljenoj 1978. godine, kojom se izaziva igrače da se sjete sekvenci povećavane dužine. Na licu uređaja, postoje 4 različite boje dugmadi, svaki sa svojom prepoznatljivim zvukom. Ovi tasteri svijetle nasumice, stvarajući sekvencu da igrač mora onda se sjeti. Ako igrač uspije u pamćenju sekvenci svjetla u ispravnom redosledu, on prelazi na sljedeću fazu, u kojoj je predstavljena identična sekvenca sa pomoćnim koraomk. Ako su neispravni, igra je izgubljena, a igrač mora ponovo početi iz početka. Cilj je dobizi visok rezultat - svaki korak u nizu vrijedi jedan bod, tako da tačan slijed od 8 svjetala vrijedi 8 poena na tabeli rezultata. El Blinken es basa en un joc electrònic llançat el 1978, desafia als jugadors a recordar seqüències incrementant-les cada vegada. A la cara del dispositiu hi ha 4 botons de colors diferents, cadascun amb el seu propi so distintiu. Aquests botons s'encenen a l'atzar, creant la seqüència que el jugador ha de recordar. Si el jugador té èxit recordant la seqüència de llums en l'ordre correcte, avançarà a la següent etapa, on se li presentarà una seqüència idèntica amb un pas addicional. Si són incorrectes, es perdrà en el joc, i el jugador haurà de començar de nou des del començament. L'objectiu és aconseguir una alta puntuació: cada pas en la seqüència val un punt, de manera que encertar una seqüència de 8 llums valdrà 8 punts a la taula de puntuació. - El Blinken es basa en un joc electrònic llançat el 1978, desafia als jugadors a recordar seqüències incrementant-les cada vegada. A la cara del dispositiu hi ha 4 botons de colors diferents, cadascun amb el seu propi so distintiu. Estos botons s'encenen a l'atzar, creant la seqüència que el jugador ha de recordar. Si el jugador té èxit recordant la seqüència de llums en l'orde correcte, avançarà a la següent etapa, on se li presentarà una seqüència idèntica amb un pas addicional. Si són incorrectes, es perdrà en el joc, i el jugador haurà de començar de nou des del començament. L'objectiu és aconseguir una alta puntuació: cada pas en la seqüència val un punt, de manera que encertar una seqüència de 8 llums valdrà 8 punts a la taula de puntuació. + El Blinken es basa en un joc electrònic llançat el 1978, desafia als jugadors a recordar seqüències incrementant-les cada vegada. A la cara del dispositiu hi ha 4 botons de colors diferents, cadascun amb el seu propi so distintiu. Aquests botons s'encenen a l'atzar, creant la seqüència que el jugador ha de recordar. Si el jugador té èxit recordant la seqüència de llums en l'ordre correcte, avançarà a la següent etapa, on se li presentarà una seqüència idèntica amb un pas addicional. Si són incorrectes, es perdrà en el joc, i el jugador haurà de començar de nou des del començament. L'objectiu és aconseguir una alta puntuació: cada pas en la seqüència val un punt, de manera que encertar una seqüència de 8 llums valdrà 8 punts a la taula de puntuació. Die Idee zu Blinken gründet auf einem alten elektronischen Spiel aus dem Jahre 1978: der Spieler musste sich immer länger werdende Tasten- bzw. Tonfolgen merken. Auf dem Spielgerät von Blinken finden Sie vier verschiedenfarbige Knöpfe und jeder hat seinen eigenen individuellen Ton. Während des Spiels leuchten diese Knöpfe in zufälliger Reihenfolge, die der Spieler sich merken und wiederholen muss. Wenn der Spieler es schafft, die Sequenz in der richtigen Reihenfolge wiederzugeben, erreicht er die nächste Spielstufe, in der er die gleiche Sequenz plus einer weiteren Taste wiedergeben muss. Wenn die Reihenfolge einmal falsch ist, hat der Spieler verloren und muss von vorne beginnen. Das Ziel des Spiels ist es, möglichst viele Punkte zu erreichen. Jede erfolgreiche Runde bringt einen Punkt, eine erfolgreiche Folge von 8 Knöpfen ergibt also 8 Punkte in der Bestenliste. Blinken is based on an electronic game released in 1978, which challenges players to remember sequences of increasing length. On the face of the device, there are 4 different colour buttons, each one with their own distinctive sound. These buttons light up randomly, creating the sequence that the player must then recall. If the player is successful in remembering the sequence of lights in the correct order, they advance to the next stage, where an identical sequence with one extra step is presented. If they are incorrect, the game is lost, and the player must start again from the beginning. The goal is to get a high score - each step in the sequence is worth one point, so correct entry of a sequence of 8 lights is worth 8 points on the high score table. Blinken se basa en un juego electrónico publicado en 1978 que reta a los jugadores a recordar secuencias de una longitud cada vez mayor. En la parte superior del dispositivo, hay cuatro botones de diferentes colores, cada uno con su propio sonido. Dichos botones se encienden de manera aleatoria, creando una secuencia que el jugador debe recordar. Si el jugador consigue recordar la secuencia de luces en el orden correcto, avanzan hasta la siguiente fase, en la que se muestra una secuencia idéntica, pero con un paso más. Si el jugador se equivoca, pierde la partida y tiene que empezar de nuevo desde el principio. El objetivo es obtener la mayor puntuación; cada paso en la secuencia vale un punto, así que si se aciertan todos los pasos de una secuencia de ocho luces, se obtienen ocho puntos en la tabla de mejores puntuaciones. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-17.12.3/po/ca(a)valencia/blinken.po new/blinken-18.04.0/po/ca(a)valencia/blinken.po --- old/blinken-17.12.3/po/ca(a)valencia/blinken.po 2018-03-06 01:08:56.000000000 +0100 +++ new/blinken-18.04.0/po/ca(a)valencia/blinken.po 2018-04-13 02:02:32.000000000 +0200 @@ -116,7 +116,7 @@ #: blinken.cpp:763 #, kde-format msgid "Press the key for this button" -msgstr "Premeu la tecla per este botó" +msgstr "Premeu la tecla per aquest botó" #: blinken.cpp:764 #, kde-format @@ -161,7 +161,7 @@ #: blinken.cpp:831 #, kde-format msgid "Remember this sequence..." -msgstr "Recordeu esta seqüència..." +msgstr "Recordeu aquesta seqüència..." #: blinken.cpp:842 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-17.12.3/po/zh_CN/blinken.po new/blinken-18.04.0/po/zh_CN/blinken.po --- old/blinken-17.12.3/po/zh_CN/blinken.po 2018-03-06 01:08:56.000000000 +0100 +++ new/blinken-18.04.0/po/zh_CN/blinken.po 2018-04-13 02:02:33.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2018-02-28 02:29-0500\n" +"PO-Revision-Date: 2018-04-05 09:42-0400\n" "Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"

1 0

commit artikulate for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package artikulate for openSUSE:Factory checked in at 2018-04-27 16:01:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/artikulate (Old) and /work/SRC/openSUSE:Factory/.artikulate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "artikulate" Fri Apr 27 16:01:29 2018 rev:49 rq:598971 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/artikulate/artikulate.changes 2018-03-22 11:59:07.362570089 +0100 +++ /work/SRC/openSUSE:Factory/.artikulate.new/artikulate.changes 2018-04-27 16:01:31.639449401 +0200 @@ -1,0 +2,20 @@ +Wed Apr 18 07:48:34 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:42 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * None + +------------------------------------------------------------------- Old: ---- artikulate-17.12.3.tar.xz New: ---- artikulate-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ artikulate.spec ++++++ --- /var/tmp/diff_new_pack.ZIAqw1/_old 2018-04-27 16:01:32.279425914 +0200 +++ /var/tmp/diff_new_pack.ZIAqw1/_new 2018-04-27 16:01:32.279425914 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: artikulate -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ artikulate-17.12.3.tar.xz -> artikulate-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-17.12.3/org.kde.artikulate.appdata.xml new/artikulate-18.04.0/org.kde.artikulate.appdata.xml --- old/artikulate-17.12.3/org.kde.artikulate.appdata.xml 2018-02-21 23:42:31.000000000 +0100 +++ new/artikulate-18.04.0/org.kde.artikulate.appdata.xml 2018-03-13 03:21:08.000000000 +0100 @@ -70,7 +70,7 @@ Artikulate is a pronunciation trainer that helps improving and perfecting a learner's pronunciation skills for a foreign language. It provides courses with native speaker recordings for several training languages. The learner downloads those courses, selects a category of phrases to train, then starts with recording her/his own voice when speaking the phrases and comparing the results to the native speaker's recordings by listening to both. By adjusting and repeating the own pronunciation, the learner can improve his/her skill. Artikulate je trener izgovora koji poboljšava i usavršava izgovorne vještine za učenike stranih jezik. Ona pruža kurseve sa snimcima na maternjem jeziku za nekoliko jezika obuke. Učenik preuzima ove kurseve, bira kategoriju fraza za obuku, a zatim počinje sa snimanjem njegovog/njenog glasa pri izgovoru fraze.i Porede se rezultati snimaka na maternji i slušaju oba. Podešavanjem i ponavljanja sopstvenog izgovora, učenik može da poboljša njegovu / njenu vještinu. L'Artikulate és un entrenador de pronunciació que ajuda a millor i perfeccionar les habilitats de pronunciació d'un alumne d'un idioma estranger. Proporciona cursos amb enregistraments d'un parlant natiu. L'alumne baixa aquests cursos, selecciona una categoria de frases per entrenar, després comença enregistrant la seva pròpia veu en pronunciar les frases i compara els resultats amb els enregistraments del parlant natiu escoltant els dos. Ajustant i repetint la pronunciació pròpia, l'alumne pot millorar la seva habilitat. - L'Artikulate és un entrenador de pronunciació que ajuda a millor i perfeccionar les habilitats de pronunciació d'un alumne d'un idioma estranger. Proporciona cursos amb enregistraments d'un parlant natiu. L'alumne baixa estos cursos, selecciona una categoria de frases per entrenar, després comença gravant la seua pròpia veu en pronunciar les frases i compara els resultats amb els enregistraments del parlant natiu escoltant els dos. Ajustant i repetint la pronunciació pròpia, l'alumne pot millorar la seua habilitat. + L'Artikulate és un entrenador de pronunciació que ajuda a millor i perfeccionar les habilitats de pronunciació d'un alumne d'un idioma estranger. Proporciona cursos amb enregistraments d'un parlant natiu. L'alumne baixa aquests cursos, selecciona una categoria de frases per entrenar, després comença enregistrant la seua pròpia veu en pronunciar les frases i compara els resultats amb els enregistraments del parlant natiu escoltant els dos. Ajustant i repetint la pronunciació pròpia, l'alumne pot millorar la seua habilitat. Artikulate er udtaletræning som hjælper med at forbedre og perfektionere din udtale af et fremmedsprog. Det leverer kurser med modersmåloptagelser for flere øvelsessprog. Eleven downloader disse kurser, vælger en kategori af fraser der skal øves, og begynder så at optage sin egen stemme når fraserne udtales og sammenligner resultaterne med modersmåloptagelserne ved at lytte til begge. Ved at justere og gentage den egen udtale, kan eleven forbedre sine evner. Artikulate ist eine Anwendung zum Üben der Aussprache und hilft beim Verbessern und Perfektionieren Ihrer Aussprachefähigkeiten für eine fremde Sprache. Dazu können Übungen mit Aufnahmen von Muttersprachlern für mehrere Zielsprachen heruntergeladen werden. Dann wird eine Gruppe von Redewendungen ausgewählt, die eigene Stimme beim Aussprechen der Redewendungen aufgenommen und mit den Aufnahmen von Muttersprachlern verglichen. Durch Anpassen und Wiederholen kann die eigene Aussprache verbessert werden. Artikulate is a pronunciation trainer that helps improving and perfecting a learner's pronunciation skills for a foreign language. It provides courses with native speaker recordings for several training languages. The learner downloads those courses, selects a category of phrases to train, then starts with recording her/his own voice when speaking the phrases and comparing the results to the native speaker's recordings by listening to both. By adjusting and repeating the own pronunciation, the learner can improve his/her skill. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-17.12.3/po/ca/artikulate.po new/artikulate-18.04.0/po/ca/artikulate.po --- old/artikulate-17.12.3/po/ca/artikulate.po 2018-03-06 01:08:52.000000000 +0100 +++ new/artikulate-18.04.0/po/ca/artikulate.po 2018-04-13 02:02:30.000000000 +0200 @@ -906,3 +906,144 @@ #, kde-format msgid "Volume" msgstr "Volum" + +#~ msgid "Create New Course" +#~ msgstr "Crea un curs nou" + +#~ msgid "none" +#~ msgstr "cap" + +#~ msgid "New Course" +#~ msgstr "Curs nou" + +#~ msgid "Title:" +#~ msgstr "Títol:" + +#~ msgid "Description:" +#~ msgstr "Descripció:" + +#~ msgid "Use Skeleton" +#~ msgstr "Usa l'esquelet" + +#~ msgid "Identifier" +#~ msgstr "Identificador" + +#~ msgid "Category: %1" +#~ msgstr "Categoria: %1" + +#~ msgctxt "@info:credit" +#~ msgid "(c) 2013-2014 The Artikulate Developers" +#~ msgstr "(c) 2013-2014 The Artikulate Developers" + +#~ msgid "Edit Skeleton" +#~ msgstr "Edita esquelet" + +#~ msgid "Course" +#~ msgstr "Curs" + +#~ msgid "Configure Shortcuts..." +#~ msgstr "Configura les dreceres..." + +#~ msgid "M&ode" +#~ msgstr "M&ode" + +#~ msgid "Learn and practice pronunciation." +#~ msgstr "Aprendre i practicar la pronunciació." + +#~ msgid "Please select a language." +#~ msgstr "Seleccioneu un idioma." + +#~ msgid "Unselected" +#~ msgstr "Sense seleccionar" + +#~ msgid "OK" +#~ msgstr "D'acord" + +#~ msgid "Close Course" +#~ msgstr "Tanca el curs" + +#~ msgid "Skeleton: %1" +#~ msgstr "Esquelet: %1" + +#~ msgid "Units" +#~ msgstr "Unitats" + +#~ msgid "Add Unit" +#~ msgstr "Afegeix una unitat" + +#~ msgid "No Course Repository Selected" +#~ msgstr "No s'ha seleccionat cap repositori de cursos" + +#~ msgid "" +#~ "Editor is only available when Artikulate works on a course data " +#~ "repository. Please see program settings." +#~ msgstr "" +#~ "L'editor només està disponible quan Artikulate treballa sobre un " +#~ "repositori de dades dels cursos. Si us plau, mireu a la configuració del " +#~ "programa." + +#~ msgid "Select Course Language:" +#~ msgstr "Seleccioneu un idioma pel curs:" + +#~ msgid "Language: " +#~ msgstr "Idioma: " + +#~ msgid "unselected" +#~ msgstr "sense seleccionar" + +#~ msgid "Select Skeleton:" +#~ msgstr "Seleccioneu un esquelet:" + +#~ msgid "Please select a favorite language" +#~ msgstr "Seleccioneu un idioma preferit" + +#~ msgid "Length:" +#~ msgstr "Durada:" + +#~ msgid "Unit: %1" +#~ msgstr "Unitat: %1" + +#~ msgid "Finish Training" +#~ msgstr "Finalitza l'entrenament" + +#~ msgid "Phrases Grouped by Attempts" +#~ msgstr "Frases agrupades per intents" + +#~ msgid "Training Progress" +#~ msgstr "Progrés de l'entrenament" + +#~ msgid "Create Learner Identity" +#~ msgstr "Crea una identitat d'aprenentatge" + +#~ msgid "Start by creating a learner identity" +#~ msgstr "Comenceu creant una identitat d'aprenentatge" + +#~ msgid "Start Training" +#~ msgstr "Inicia l'entrenament" + +#~ msgid "Native Speaker" +#~ msgstr "Parlant natiu" + +#~ msgid "Learner (You)" +#~ msgstr "Aprenent (vós)" + +#~ msgid "Unit: " +#~ msgstr "Unitat: " + +#~ msgid "Add Phrase" +#~ msgstr "Afegeix una frase" + +#~ msgid "Language: %1" +#~ msgstr "Idioma: %1" + +#~ msgid "Course: %1" +#~ msgstr "Curs: %1" + +#~ msgid "Editor" +#~ msgstr "Editor" + +#~ msgid "Course Skeleton:" +#~ msgstr "Esquelet del curs:" + +#~ msgid "Course:" +#~ msgstr "Curs:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-17.12.3/po/ca(a)valencia/artikulate.po new/artikulate-18.04.0/po/ca(a)valencia/artikulate.po --- old/artikulate-17.12.3/po/ca(a)valencia/artikulate.po 2018-03-06 01:08:52.000000000 +0100 +++ new/artikulate-18.04.0/po/ca(a)valencia/artikulate.po 2018-04-13 02:02:30.000000000 +0200 @@ -575,7 +575,7 @@ #: src/qml/NewUserWelcome.qml:41 #, kde-format msgid "There are no courses installed on this system." -msgstr "No hi ha cap curs instal·lat en este sistema." +msgstr "No hi ha cap curs instal·lat en aquest sistema." #: src/qml/NewUserWelcome.qml:44 #, kde-format @@ -610,22 +610,22 @@ #: src/qml/PhraseEditorSoundComponent.qml:38 #, kde-format msgid "Native Speaker Recording" -msgstr "Gravació d'un parlant nadiu" +msgstr "Enregistrament d'un parlant nadiu" #: src/qml/PhraseEditorSoundComponent.qml:48 #, kde-format msgid "Existing Recording:" -msgstr "Gravació existent:" +msgstr "Enregistrament existent:" #: src/qml/PhraseEditorSoundComponent.qml:58 #, kde-format msgid "Create New Recording:" -msgstr "Crea un nou gravació\t:" +msgstr "Crea un nou enregistrament:" #: src/qml/PhraseEditorSoundComponent.qml:74 #, kde-format msgid "Replace existing recording" -msgstr "Substitueix l'gravació\t existent" +msgstr "Substitueix l'enregistrament existent" #: src/qml/PhraseEditorSoundComponent.qml:82 #, kde-format @@ -720,7 +720,7 @@ #: src/qml/ProfileUserItem.qml:175 #, kde-format msgid "Do you really want to delete this identity \"%1\"?" -msgstr "Esteu segur que voleu suprimir esta identitat «%1»?" +msgstr "Esteu segur que voleu suprimir aquesta identitat «%1»?" #: src/qml/ProfileUserItem.qml:191 #, kde-format @@ -740,7 +740,7 @@ #: src/qml/SoundRecorder.qml:31 #, kde-format msgid "Record" -msgstr "Grava" +msgstr "Enregistra" #: src/qml/TrainerCourseStatistics.qml:59 #, kde-format @@ -814,7 +814,7 @@ "you to work on courses and course skeletons in a structured way. For details " "please refer to the technical documentation." msgstr "" -"Este diàleg permet la configuració avançada. Només està adreçat als " +"Aquest diàleg permet la configuració avançada. Només està adreçat als " "traductors, parladors i altres usuaris de l'editor del curs. El fet d'afegir " "un repositori vos permetrà treballar en els cursos i els esquelets del curs " "d'una manera estructurada. Per obtindre més informació, consulteu la " @@ -839,7 +839,7 @@ "Use this option only if you are a course contributor and you are working on " "a course repository." msgstr "" -"Useu esta opció només si sou un col·laborador del curs i esteu treballant " +"Useu aquesta opció només si sou un col·laborador del curs i esteu treballant " "sobre un repositori de cursos." #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseCourseRepository) @@ -876,19 +876,19 @@ #: src/ui/sounddevicedialogpage.ui:68 #, kde-format msgid "Record Test Sound" -msgstr "Grava una prova de so" +msgstr "Enregistra una prova de so" #. i18n: ectx: property (toolTip), widget (QToolButton, buttonPlayRecordedTestSound) #: src/ui/sounddevicedialogpage.ui:75 #, kde-format msgid "Play recorded test sound." -msgstr "Reprodueix un so de prova gravat." +msgstr "Reprodueix un so de prova enregistrat." #. i18n: ectx: property (toolTip), widget (QToolButton, buttonRecordTestSound) #: src/ui/sounddevicedialogpage.ui:85 #, kde-format msgid "Record test sound." -msgstr "Grava una prova de so." +msgstr "Enregistra una prova de so." #. i18n: ectx: property (text), widget (QLabel, labelTestSoundSettings) #: src/ui/sounddevicedialogpage.ui:107 @@ -907,3 +907,144 @@ #, kde-format msgid "Volume" msgstr "Volum" + +#~ msgid "Create New Course" +#~ msgstr "Crea un curs nou" + +#~ msgid "none" +#~ msgstr "cap" + +#~ msgid "New Course" +#~ msgstr "Curs nou" + +#~ msgid "Title:" +#~ msgstr "Títol:" + +#~ msgid "Description:" +#~ msgstr "Descripció:" + +#~ msgid "Use Skeleton" +#~ msgstr "Usa l'esquelet" + +#~ msgid "Identifier" +#~ msgstr "Identificador" + +#~ msgid "Category: %1" +#~ msgstr "Categoria: %1" + +#~ msgctxt "@info:credit" +#~ msgid "(c) 2013-2014 The Artikulate Developers" +#~ msgstr "(c) 2013-2014 The Artikulate Developers" + +#~ msgid "Edit Skeleton" +#~ msgstr "Edita esquelet" + +#~ msgid "Course" +#~ msgstr "Curs" + +#~ msgid "Configure Shortcuts..." +#~ msgstr "Configura les dreceres..." + +#~ msgid "M&ode" +#~ msgstr "M&ode" + +#~ msgid "Learn and practice pronunciation." +#~ msgstr "Aprendre i practicar la pronunciació." + +#~ msgid "Please select a language." +#~ msgstr "Seleccioneu un idioma." + +#~ msgid "Unselected" +#~ msgstr "Sense seleccionar" + +#~ msgid "OK" +#~ msgstr "D'acord" + +#~ msgid "Close Course" +#~ msgstr "Tanca el curs" + +#~ msgid "Skeleton: %1" +#~ msgstr "Esquelet: %1" + +#~ msgid "Units" +#~ msgstr "Unitats" + +#~ msgid "Add Unit" +#~ msgstr "Afegeix una unitat" + +#~ msgid "No Course Repository Selected" +#~ msgstr "No s'ha seleccionat cap repositori de cursos" + +#~ msgid "" +#~ "Editor is only available when Artikulate works on a course data " +#~ "repository. Please see program settings." +#~ msgstr "" +#~ "L'editor només està disponible quan Artikulate treballa sobre un " +#~ "repositori de dades dels cursos. Si us plau, mireu a la configuració del " +#~ "programa." + +#~ msgid "Select Course Language:" +#~ msgstr "Seleccioneu un idioma pel curs:" + +#~ msgid "Language: " +#~ msgstr "Idioma: " + +#~ msgid "unselected" +#~ msgstr "sense seleccionar" + +#~ msgid "Select Skeleton:" +#~ msgstr "Seleccioneu un esquelet:" + +#~ msgid "Please select a favorite language" +#~ msgstr "Seleccioneu un idioma preferit" + +#~ msgid "Length:" +#~ msgstr "Durada:" + +#~ msgid "Unit: %1" +#~ msgstr "Unitat: %1" + +#~ msgid "Finish Training" +#~ msgstr "Finalitza l'entrenament" + +#~ msgid "Phrases Grouped by Attempts" +#~ msgstr "Frases agrupades per intents" + +#~ msgid "Training Progress" +#~ msgstr "Progrés de l'entrenament" + +#~ msgid "Create Learner Identity" +#~ msgstr "Crea una identitat d'aprenentatge" + +#~ msgid "Start by creating a learner identity" +#~ msgstr "Comenceu creant una identitat d'aprenentatge" + +#~ msgid "Start Training" +#~ msgstr "Inicia l'entrenament" + +#~ msgid "Native Speaker" +#~ msgstr "Parlant natiu" + +#~ msgid "Learner (You)" +#~ msgstr "Aprenent (vós)" + +#~ msgid "Unit: " +#~ msgstr "Unitat: " + +#~ msgid "Add Phrase" +#~ msgstr "Afegeix una frase" + +#~ msgid "Language: %1" +#~ msgstr "Idioma: %1" + +#~ msgid "Course: %1" +#~ msgstr "Curs: %1" + +#~ msgid "Editor" +#~ msgstr "Editor" + +#~ msgid "Course Skeleton:" +#~ msgstr "Esquelet del curs:" + +#~ msgid "Course:" +#~ msgstr "Curs:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-17.12.3/po/en_GB/artikulate.po new/artikulate-18.04.0/po/en_GB/artikulate.po --- old/artikulate-17.12.3/po/en_GB/artikulate.po 2018-03-06 01:08:52.000000000 +0100 +++ new/artikulate-18.04.0/po/en_GB/artikulate.po 2018-04-13 02:02:30.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-07-02 03:01+0200\n" -"PO-Revision-Date: 2017-12-29 14:51+0000\n" +"PO-Revision-Date: 2017-12-29 15:33+0000\n" "Last-Translator: Steve Allewell <steve.allewell(a)gmail.com>\n" "Language-Team: British English <kde-i18n-doc(a)kde.org>\n" "Language: en_GB\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-17.12.3/po/zh_CN/artikulate.po new/artikulate-18.04.0/po/zh_CN/artikulate.po --- old/artikulate-17.12.3/po/zh_CN/artikulate.po 2018-03-06 01:08:53.000000000 +0100 +++ new/artikulate-18.04.0/po/zh_CN/artikulate.po 2018-04-13 02:02:30.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-07-02 03:01+0200\n" -"PO-Revision-Date: 2018-02-28 02:29-0500\n" +"PO-Revision-Date: 2018-04-05 09:42-0400\n" "Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -442,7 +442,7 @@ #: src/qml/Editor.qml:75 #, kde-format msgid "no repository set" -msgstr "" +msgstr "没有设置仓库" #: src/qml/Editor.qml:79 #, kde-format

1 0

commit analitza for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package analitza for openSUSE:Factory checked in at 2018-04-27 16:01:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/analitza (Old) and /work/SRC/openSUSE:Factory/.analitza.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "analitza" Fri Apr 27 16:01:27 2018 rev:78 rq:598969 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/analitza/analitza.changes 2018-03-22 11:59:05.138649837 +0100 +++ /work/SRC/openSUSE:Factory/.analitza.new/analitza.changes 2018-04-27 16:01:29.611523823 +0200 @@ -1,0 +2,20 @@ +Wed Apr 18 07:48:33 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:40 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * Remove obsolete reviewboardrc file + +------------------------------------------------------------------- Old: ---- analitza-17.12.3.tar.xz New: ---- analitza-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ analitza.spec ++++++ --- /var/tmp/diff_new_pack.xGlqlg/_old 2018-04-27 16:01:30.255500189 +0200 +++ /var/tmp/diff_new_pack.xGlqlg/_new 2018-04-27 16:01:30.259500042 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: analitza -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ analitza-17.12.3.tar.xz -> analitza-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/.reviewboardrc new/analitza-18.04.0/.reviewboardrc --- old/analitza-17.12.3/.reviewboardrc 2017-11-20 13:03:57.000000000 +0100 +++ new/analitza-18.04.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -REPOSITORY = "git://anongit.kde.org/analitza" -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -TARGET_GROUPS = "kdeedu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/ast/analitza_qt.po new/analitza-18.04.0/poqm/ast/analitza_qt.po --- old/analitza-17.12.3/poqm/ast/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/ast/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -1,10 +1,17 @@ +# enolp <enolp(a)softastur.org>, 2018. msgid "" msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2018-01-17 18:04+0100\n" +"Last-Translator: enolp <enolp(a)softastur.org>\n" +"Language-Team: Asturian <>\n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" msgctxt "QObject|dictionary" msgid "xaxaxaxaxa" @@ -1111,7 +1118,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "x=%1 y=%2" -msgstr "" +msgstr "x=%1 y=%2" #: analitzaplot/private/backends/cartesiansurface.cpp:52 msgctxt "Function type|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/ca/analitza_qt.po new/analitza-18.04.0/poqm/ca/analitza_qt.po --- old/analitza-17.12.3/poqm/ca/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/ca/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -1237,3 +1237,61 @@ msgctxt "QCoreApplication|" msgid "Selected viewport too small" msgstr "La finestra de visualització seleccionada és massa petita" + +#~ msgctxt "QObject|" +#~ msgid "PNG File (*.png)" +#~ msgstr "Fitxer PNG (*.png)" + +#~ msgctxt "NAME OF TRANSLATORS" +#~ msgid "Your names" +#~ msgstr "Orestes Mas Casals" + +#~ msgctxt "EMAIL OF TRANSLATORS" +#~ msgid "Your emails" +#~ msgstr "orestes(a)tsc.upc.edu" + +#~ msgctxt "Parameter in function prototype" +#~ msgid "par%1" +#~ msgstr "par%1" + +#~ msgctxt "Function parameter separator" +#~ msgid ", " +#~ msgstr ", " + +#, fuzzy +#~| msgid "Hyperbolic secant" +#~ msgctxt "dictionary" +#~ msgid "Hiperbola" +#~ msgstr "Secant hiperbòlica" + +#~ msgid "Function type not correct for functions depending on %1" +#~ msgstr "El tipus de funció no és correcte per funcions que depenen de %1" + +#~ msgctxt "" +#~ "This function can't be represented as a curve. To draw implicit curve, " +#~ "the function has to satisfy the implicit function theorem." +#~ msgid "Implicit function undefined in the plane" +#~ msgstr "la funció implícita no està definida en el pla" + +#~ msgid "center" +#~ msgstr "centre" + +#~ msgctxt "@title:column" +#~ msgid "Function" +#~ msgstr "Funció" + +#~ msgid "%1 function added" +#~ msgstr "S'ha afegit la funció %1" + +#~ msgid "Hide '%1'" +#~ msgstr "Oculta «%1»" + +#~ msgid "Show '%1'" +#~ msgstr "Mostra «%1»" + +#~ msgid "Remove '%1'" +#~ msgstr "Elimina «%1»" + +#~ msgctxt "Error message" +#~ msgid "Unknown token %1" +#~ msgstr "Token desconegut: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/ca(a)valencia/analitza_qt.po new/analitza-18.04.0/poqm/ca(a)valencia/analitza_qt.po --- old/analitza-17.12.3/poqm/ca(a)valencia/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/ca(a)valencia/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -159,7 +159,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "To use '%1' command the input matrix must be square" -msgstr "Per usar l'orde «%1» cal que la matriu d'entrada siga quadrada" +msgstr "Per usar l'ordre «%1» cal que la matriu d'entrada siga quadrada" #: analitza/commands/eigencommands.cpp:68 #: analitza/commands/eigencommands.cpp:74 @@ -1237,3 +1237,61 @@ msgctxt "QCoreApplication|" msgid "Selected viewport too small" msgstr "La finestra de visualització seleccionada és massa petita" + +#~ msgctxt "QObject|" +#~ msgid "PNG File (*.png)" +#~ msgstr "Fitxer PNG (*.png)" + +#~ msgctxt "NAME OF TRANSLATORS" +#~ msgid "Your names" +#~ msgstr "Orestes Mas Casals" + +#~ msgctxt "EMAIL OF TRANSLATORS" +#~ msgid "Your emails" +#~ msgstr "orestes(a)tsc.upc.edu" + +#~ msgctxt "Parameter in function prototype" +#~ msgid "par%1" +#~ msgstr "par%1" + +#~ msgctxt "Function parameter separator" +#~ msgid ", " +#~ msgstr ", " + +#, fuzzy +#~| msgid "Hyperbolic secant" +#~ msgctxt "dictionary" +#~ msgid "Hiperbola" +#~ msgstr "Secant hiperbòlica" + +#~ msgid "Function type not correct for functions depending on %1" +#~ msgstr "El tipus de funció no és correcte per funcions que depenen de %1" + +#~ msgctxt "" +#~ "This function can't be represented as a curve. To draw implicit curve, " +#~ "the function has to satisfy the implicit function theorem." +#~ msgid "Implicit function undefined in the plane" +#~ msgstr "la funció implícita no està definida en el pla" + +#~ msgid "center" +#~ msgstr "centre" + +#~ msgctxt "@title:column" +#~ msgid "Function" +#~ msgstr "Funció" + +#~ msgid "%1 function added" +#~ msgstr "S'ha afegit la funció %1" + +#~ msgid "Hide '%1'" +#~ msgstr "Oculta «%1»" + +#~ msgid "Show '%1'" +#~ msgstr "Mostra «%1»" + +#~ msgid "Remove '%1'" +#~ msgstr "Elimina «%1»" + +#~ msgctxt "Error message" +#~ msgid "Unknown token %1" +#~ msgstr "Token desconegut: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/en_GB/analitza_qt.po new/analitza-18.04.0/poqm/en_GB/analitza_qt.po --- old/analitza-17.12.3/poqm/en_GB/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/en_GB/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-16 03:26+0000\n" -"PO-Revision-Date: 2017-11-26 21:22+0000\n" +"PO-Revision-Date: 2017-11-26 15:20+0000\n" "Last-Translator: Steve Allewell <steve.allewell(a)gmail.com>\n" "Language-Team: British English <kde-i18n-doc(a)kde.org>\n" "Language: en_GB\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/fr/analitza_qt.po new/analitza-18.04.0/poqm/fr/analitza_qt.po --- old/analitza-17.12.3/poqm/fr/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/fr/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-16 03:26+0000\n" "PO-Revision-Date: 2018-01-08 16:53+0800\n" "Last-Translator: Simon Depiets <sdepiets(a)gmail.com>\n" @@ -17,6 +16,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "X-Qt-Contexts: true\n" msgctxt "QObject|dictionary" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/gl/analitza_qt.po new/analitza-18.04.0/poqm/gl/analitza_qt.po --- old/analitza-17.12.3/poqm/gl/analitza_qt.po 2018-03-06 01:08:47.000000000 +0100 +++ new/analitza-18.04.0/poqm/gl/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -35,7 +35,7 @@ #: analitza/analyzer.cpp:188 msgctxt "QCoreApplication|" msgid "Cannot calculate an empty expression" -msgstr "Non é posíbel calcular unha expresión baleira" +msgstr "Non se pode calcular unha expresión baleira" #: analitza/analyzer.cpp:235 analitza/analyzer.cpp:254 #: analitza/analyzer.cpp:280 @@ -58,7 +58,7 @@ msgctxt "Error message, no proper condition found.|" msgid "Could not find a proper choice for a condition statement." msgstr "" -"Non foi posíbel atopar unha escolla axeitada para unha sentenza condicional." +"Non se puido atopar unha escolla axeitada para unha sentenza condicional." #: analitza/analyzer.cpp:937 msgctxt "QCoreApplication|" @@ -299,7 +299,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Cannot have two parameters with the same name like '%1'." -msgstr "Non é posíbel ter dous parámetros co mesmo nome que «%1»." +msgstr "Non se poden ter dous parámetros co mesmo nome que «%1»." #: analitza/expression.cpp:259 msgctxt "" @@ -349,7 +349,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Cannot codify the %1 value." -msgstr "Non é posíbel codificar o valor %1." +msgstr "Non se pode codificar o valor %1." #: analitza/expression.cpp:462 #, qt-format @@ -416,7 +416,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Could not find a type that unifies '%1'" -msgstr "Non foi posíbel atopar un tipo que unifique «%1»." +msgstr "Non se puido atopar un tipo que unifique «%1»." #: analitza/expressiontypechecker.cpp:473 msgctxt "QCoreApplication|" @@ -427,14 +427,14 @@ #, qt-format msgctxt "type error message|" msgid "Cannot call '%1'" -msgstr "Non é posíbel chamar a «%1»." +msgstr "Non se pode chamar a «%1»." #: analitza/expressiontypechecker.cpp:593 #, qt-format msgctxt "QCoreApplication|" msgid "Cannot reduce '%1' to '%2'. Invalid type of parameter '%3' for '%4'" msgstr "" -"Non é posíbel reducir «%1» a «%2». O tipo do parámetro «%3» para «%4» é " +"Non se pode reducir «%1» a «%2». O tipo do parámetro «%3» para «%4» é " "incorrecto." #: analitza/expressiontypechecker.cpp:604 @@ -449,20 +449,20 @@ msgctxt "QCoreApplication|" msgid "Cannot compare '%1' to '%2'. Invalid type of parameter '%3' for '%4'" msgstr "" -"Non é posíbel comparar «%1» a «%2». O tipo do parámetro «%3» para «%4» é " +"Non se pode comparar «%1» a «%2». O tipo do parámetro «%3» para «%4» é " "incorrecto." #: analitza/expressiontypechecker.cpp:654 #, qt-format msgctxt "QCoreApplication|" msgid "Could not call '%1'" -msgstr "Non foi posíbel chamar por «%1»." +msgstr "Non se puido chamar por «%1»." #: analitza/expressiontypechecker.cpp:662 #, qt-format msgctxt "QCoreApplication|" msgid "Could not solve '%1'" -msgstr "Non foi posíbel resolver «%1»." +msgstr "Non se puido resolver «%1»." #: analitza/expressiontypechecker.cpp:695 #, qt-format @@ -473,7 +473,7 @@ #: analitza/expressiontypechecker.cpp:718 msgctxt "QCoreApplication|" msgid "Could not determine the type for piecewise" -msgstr "Non foi posíbel determinar o tipo de segmento." +msgstr "Non se puido determinar o tipo de segmento." #: analitza/expressiontypechecker.cpp:937 msgctxt "QCoreApplication|" @@ -484,7 +484,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Cannot convert '%1' to '%2'" -msgstr "Non é posíbel converter «%1» en «%2»." +msgstr "Non se pode converter «%1» en «%2»." #: analitza/htmlexpressionwriter.cpp:54 analitza/htmlexpressionwriter.cpp:55 #, qt-format @@ -507,22 +507,22 @@ #: analitza/operations.cpp:54 analitza/operations.cpp:189 msgctxt "QCoreApplication|" msgid "Cannot divide by 0." -msgstr "Non é posíbel dividir por 0." +msgstr "Non se pode dividir por 0." #: analitza/operations.cpp:70 analitza/operations.cpp:201 msgctxt "QCoreApplication|" msgid "Cannot calculate the remainder on 0." -msgstr "Non é posíbel calcular o resto de 0." +msgstr "Non se pode calcular o resto de 0." #: analitza/operations.cpp:82 analitza/operations.cpp:211 msgctxt "QCoreApplication|" msgid "Cannot calculate the factor on 0." -msgstr "Non é posíbel calcular o factor de 0." +msgstr "Non se pode calcular o factor de 0." #: analitza/operations.cpp:138 analitza/operations.cpp:259 msgctxt "QCoreApplication|" msgid "Cannot calculate the lcm of 0." -msgstr "Non é posíbel calcular o mínimo común múltiplo de 0." +msgstr "Non se pode calcular o mínimo común múltiplo de 0." #: analitza/operations.cpp:244 msgctxt "QCoreApplication|" @@ -538,13 +538,13 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Could not calculate a value %1" -msgstr "Non é posíbel calcular un valor %1." +msgstr "Non se puido calcular un valor %1." #: analitza/operations.cpp:477 #, qt-format msgctxt "QCoreApplication|" msgid "Cannot calculate %1 between a value and an error type" -msgstr "Non é posíbel calcular %1 entre un valor e un tipo de erro." +msgstr "Non se pode calcular %1 entre un valor e un tipo de erro." #: analitza/operations.cpp:493 analitza/operations.cpp:650 #: analitza/operations.cpp:782 @@ -556,7 +556,7 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Cannot operate '%1' on different sized vectors." -msgstr "Non é posíbel operar «%1» con vectores de tamaños distintos." +msgstr "Non se pode operar «%1» con vectores de tamaños distintos." #: analitza/operations.cpp:564 msgctxt "QCoreApplication|" @@ -576,13 +576,13 @@ #, qt-format msgctxt "QCoreApplication|" msgid "Could not calculate a vector's %1" -msgstr "Non é posíbel calcular o %1 dun vector" +msgstr "Non se puido calcular o %1 dun vector" #: analitza/operations.cpp:619 analitza/operations.cpp:635 #, qt-format msgctxt "QCoreApplication|" msgid "Could not calculate a list's %1" -msgstr "Non é posíbel calcular o %1 dunha lista" +msgstr "Non se puido calcular o %1 dunha lista" #: analitza/operations.cpp:701 msgctxt "QCoreApplication|" @@ -625,19 +625,19 @@ #: analitza/operations.cpp:881 msgctxt "QCoreApplication|" msgid "Cannot compute 'power' for non square matrix" -msgstr "Non é posíbel calcular «power» dunha matriz que non é cadrada." +msgstr "Non se pode calcular «power» dunha matriz que non é cadrada." #: analitza/operations.cpp:920 #, qt-format msgctxt "QCoreApplication|" msgid "Cannot calculate %1 between a matrix and an error type" -msgstr "Non é posíbel calcular %1 entre unha matriz e un tipo de erro." +msgstr "Non se pode calcular %1 entre unha matriz e un tipo de erro." #: analitza/providederivative.cpp:93 #, qt-format msgctxt "QCoreApplication|" msgid "Could not calculate the derivative for '%1'" -msgstr "Non foi posíbel calcular unha derivada de «%1»" +msgstr "Non se puido calcular unha derivada de «%1»" #: analitzagui/operatorsmodel.cpp:95 analitzagui/variablesmodel.cpp:92 #: analitzaplot/plotsdictionarymodel.cpp:36 analitzaplot/plotsmodel.cpp:75 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-17.12.3/poqm/zh_CN/analitza_qt.po new/analitza-18.04.0/poqm/zh_CN/analitza_qt.po --- old/analitza-17.12.3/poqm/zh_CN/analitza_qt.po 2018-03-06 01:08:48.000000000 +0100 +++ new/analitza-18.04.0/poqm/zh_CN/analitza_qt.po 2018-04-13 02:02:28.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-02-28 02:29-0500\n" +"PO-Revision-Date: 2018-04-05 09:42-0400\n" "Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"

1 0

commit akonadiconsole for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2018-04-27 16:01:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadiconsole" Fri Apr 27 16:01:25 2018 rev:18 rq:598960 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2018-03-22 11:59:03.706701185 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new/akonadiconsole.changes 2018-04-27 16:01:26.399641695 +0200 @@ -1,0 +2,26 @@ +Wed Apr 18 07:48:27 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:35 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * No need to set AKONADI_MIMELIB_VERSION anymore + * Use qputenv() instead of setenv() + * Make AkonadiConsole buildable on Windows + * Use QPlainTextEdit instead KPimTextEdit + * Remove unused dependencies + * Remove reference to xdgbasedirs + * Use QLAtin1Char + +------------------------------------------------------------------- Old: ---- akonadiconsole-17.12.3.tar.xz New: ---- akonadiconsole-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.6bGGzt/_old 2018-04-27 16:01:27.171613364 +0200 +++ /var/tmp/diff_new_pack.6bGGzt/_new 2018-04-27 16:01:27.175613218 +0200 @@ -17,7 +17,7 @@ Name: akonadiconsole -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.28.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ akonadiconsole-17.12.3.tar.xz -> akonadiconsole-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/CMakeLists.txt new/akonadiconsole-18.04.0/CMakeLists.txt --- old/akonadiconsole-17.12.3/CMakeLists.txt 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/CMakeLists.txt 2018-04-10 13:50:39.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.7.3") +set(KDEPIM_VERSION_NUMBER "5.8.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -27,7 +27,7 @@ include(ECMCoverageOption) # Do NOT add quote -set(KDEPIM_DEV_VERSION ) +set(KDEPIM_DEV_VERSION) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -40,14 +40,10 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") - - -set(AKONADI_MIMELIB_VERSION "5.7.3") -set(AKONADI_CONTACT_VERSION "5.7.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.7.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.3") -set(AKONADI_VERSION "5.7.3") -set(AKONADI_SEARCH_VERSION "5.7.3") +set(AKONADI_CONTACT_VERSION "5.8.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.8.0") +set(AKONADI_VERSION "5.8.0") +set(AKONADI_SEARCH_VERSION "5.8.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -55,13 +51,11 @@ set(QT_REQUIRED_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.7.3") -set(LIBKLEO_LIB_VERSION_LIB "5.7.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.7.3") -set(KCALENDARCORE_LIB_VERSION "5.7.3") -set(KCONTACTS_LIB_VERSION "5.7.3") -set(KMIME_LIB_VERSION "5.7.3") -set(KIMAP_LIB_VERSION "5.7.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.8.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.8.0") +set(KCALENDARCORE_LIB_VERSION "5.8.0") +set(KCONTACTS_LIB_VERSION "5.8.0") +set(KMIME_LIB_VERSION "5.8.0") # Find KF5 package find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) @@ -80,31 +74,34 @@ find_package(KF5KIO ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package -find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) -find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) - -find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED) - -find_package(Xapian CONFIG) -set_package_properties(Xapian PROPERTIES - DESCRIPTION "The Xapian search engine library" - URL "http://xapian.org" - TYPE REQUIRED -) +if (NOT WIN32) + find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) + find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) + + find_package(Xapian CONFIG) + set_package_properties(Xapian PROPERTIES + DESCRIPTION "The Xapian search engine library" + URL "http://xapian.org" + TYPE REQUIRED + ) + + set(ENABLE_LIBKDEPIM TRUE) + set(ENABLE_SEARCH TRUE) + set(ENABLE_CONTENTVIEWS TRUE) +endif() include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) +configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> Copyright (c) 2017 David Faure <faure(a)kde.org> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.h new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> Copyright (c) 2017 David Faure <faure(a)kde.org> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackertest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackertest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackertest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackertest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> Copyright (c) 2017 David Faure <faure(a)kde.org> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackertest.h new/akonadiconsole-18.04.0/autotests/jobtrackertest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackertest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackertest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> Copyright (c) 2017 David Faure <faure(a)kde.org> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/config-akonadiconsole.h.cmake new/akonadiconsole-18.04.0/config-akonadiconsole.h.cmake --- old/akonadiconsole-17.12.3/config-akonadiconsole.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-18.04.0/config-akonadiconsole.h.cmake 2018-04-10 13:50:39.000000000 +0200 @@ -0,0 +1,3 @@ +#cmakedefine ENABLE_LIBKDEPIM 1 +#cmakedefine ENABLE_SEARCH 1 +#cmakedefine ENABLE_CONTENTVIEWS 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/CMakeLists.txt new/akonadiconsole-18.04.0/src/CMakeLists.txt --- old/akonadiconsole-17.12.3/src/CMakeLists.txt 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/CMakeLists.txt 2018-04-10 13:50:39.000000000 +0200 @@ -36,11 +36,17 @@ monitorsmodel.cpp notificationmodel.cpp notificationmonitor.cpp - searchwidget.cpp querydebugger.cpp tagpropertiesdialog.cpp ${libakonadiconsole_tracker_SRCS} +) + +if (ENABLE_SEARCH) + set(libakonadiconsole_SRCS + ${libakonadiconsole_SRCS} + searchwidget.cpp ) +endif() qt5_generate_dbus_interface(jobtracker.h org.freedesktop.Akonadi.JobTracker.xml) qt5_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.JobTracker.xml jobtracker.h JobTracker) @@ -89,25 +95,39 @@ target_link_libraries(libakonadiconsole KF5::AkonadiCore KF5::AkonadiPrivate - KF5::AkonadiContact KF5::AkonadiWidgets KF5::AkonadiXml - KF5::AkonadiSearchCore - KF5::AkonadiSearchXapian - KF5::CalendarSupport + KF5::Mime + KF5::Contacts KF5::CalendarCore - KF5::Libkdepim - KF5::MessageViewer - KF5::DBusAddons - KF5::PimTextEdit Qt5::Sql - KF5::Crash KF5::Completion KF5::ItemViews KF5::TextWidgets KF5::XmlGui ) +if (ENABLE_SEARCH) + target_link_libraries(libakonadiconsole + KF5::AkonadiSearchCore + KF5::AkonadiSearchXapian + ) +endif() + +if (ENABLE_CONTENTVIEWS) + target_link_libraries(libakonadiconsole + KF5::AkonadiContact + KF5::CalendarSupport + KF5::MessageViewer + ) +endif() + +if (ENABLE_LIBKDEPIM) + target_link_libraries(libakonadiconsole + KF5::Libkdepim + ) +endif() + set_target_properties(libakonadiconsole PROPERTIES OUTPUT_NAME akonadiconsole VERSION ${KDEPIM_LIB_VERSION} @@ -128,25 +148,10 @@ target_link_libraries(akonadiconsole libakonadiconsole - KF5::AkonadiCore - KF5::AkonadiPrivate - KF5::AkonadiContact - KF5::AkonadiXml - KF5::AkonadiSearchCore - KF5::AkonadiSearchXapian - KF5::CalendarSupport - KF5::CalendarCore - KF5::Libkdepim - KF5::MessageViewer KF5::DBusAddons - KF5::PimTextEdit - Qt5::Sql + KF5::CoreAddons KF5::Crash - KF5::Completion - KF5::ItemViews - KF5::TextWidgets - KF5::XmlGui - ) +) install(TARGETS akonadiconsole ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.kde.akonadiconsole.desktop DESTINATION ${KDE_INSTALL_APPDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/agentwidget.cpp new/akonadiconsole-18.04.0/src/agentwidget.cpp --- old/akonadiconsole-17.12.3/src/agentwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/agentwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -23,7 +23,6 @@ #include "agentconfigdialog.h" #include "akonadiconsole_debug.h" -#include "kpimtextedit/plaintexteditorwidget.h" #include <AkonadiWidgets/agenttypedialog.h> #include <AkonadiWidgets/agentinstancewidget.h> #include <AkonadiCore/agentmanager.h> @@ -47,6 +46,7 @@ #include <KGuiItem> #include <QDialogButtonBox> #include <QVBoxLayout> +#include <QPlainTextEdit> class TextDialog : public QDialog { @@ -55,7 +55,7 @@ : QDialog(parent) { QVBoxLayout *mainLayout = new QVBoxLayout(this); - mText = new KPIMTextEdit::PlainTextEditorWidget(this); + mText = new QPlainTextEdit(this); mText->setReadOnly(true); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this); @@ -76,7 +76,7 @@ } private: - KPIMTextEdit::PlainTextEditorWidget *mText = nullptr; + QPlainTextEdit *mText = nullptr; }; using namespace Akonadi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget.cpp new/akonadiconsole-18.04.0/src/browserwidget.cpp --- old/akonadiconsole-17.12.3/src/browserwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -25,6 +25,7 @@ #include "dbaccess.h" #include "akonadibrowsermodel.h" #include "tagpropertiesdialog.h" +#include "config-akonadiconsole.h" #include <AkonadiCore/attributefactory.h> #include <AkonadiCore/changerecorder.h> @@ -76,6 +77,13 @@ #include <QFileDialog> #include <QSqlError> +#ifdef ENABLE_CONTENTVIEWS +#include <CalendarSupport/IncidenceViewer> +#include <messageviewer/viewer.h> +#include <Akonadi/Contact/ContactViewer> +#include <Akonadi/Contact/ContactGroupViewer> +#endif + using namespace Akonadi; AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY(CollectionAttributePageFactory, CollectionAttributePage) @@ -209,6 +217,28 @@ connect(contentUi.saveButton, &QPushButton::clicked, this, &BrowserWidget::save); splitter3->addWidget(contentViewParent); +#ifdef ENABLE_CONTENTVIEWS + auto w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mContactView = new Akonadi::ContactViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mContactGroupView = new Akonadi::ContactGroupViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mIncidenceView = new CalendarSupport::IncidenceViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mMailView = new MessageViewer::Viewer(this)); + contentUi.stack->addWidget(w); +#endif + connect(contentUi.attrAddButton, &QPushButton::clicked, this, &BrowserWidget::addAttribute); connect(contentUi.attrDeleteButton, &QPushButton::clicked, this, &BrowserWidget::delAttribute); connect(contentUi.flags, &KEditListWidget::changed, this, &BrowserWidget::contentViewChanged); @@ -295,20 +325,23 @@ void BrowserWidget::setItem(const Akonadi::Item &item) { mCurrentItem = item; +#ifdef ENABLE_CONTENTVIEWS if (item.hasPayload<KContacts::Addressee>()) { - contentUi.contactView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.contactViewPage); + mContactView->setItem(item); + contentUi.stack->setCurrentWidget(mContactView->parentWidget()); } else if (item.hasPayload<KContacts::ContactGroup>()) { - contentUi.contactGroupView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.contactGroupViewPage); + mContactGroupView->setItem(item); + contentUi.stack->setCurrentWidget(mContactGroupView->parentWidget()); } else if (item.hasPayload<KCalCore::Incidence::Ptr>()) { - contentUi.incidenceView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.incidenceViewPage); + mIncidenceView->setItem(item); + contentUi.stack->setCurrentWidget(mIncidenceView->parentWidget()); } else if (item.mimeType() == QLatin1String("message/rfc822") || item.mimeType() == QLatin1String("message/news")) { - contentUi.mailView->setMessageItem(item, MimeTreeParser::Force); - contentUi.stack->setCurrentWidget(contentUi.mailViewPage); - } else if (item.hasPayload<QPixmap>()) { + mMailView->setMessageItem(item, MimeTreeParser::Force); + contentUi.stack->setCurrentWidget(mMailView->parentWidget()); + } else +#endif + if (item.hasPayload<QPixmap>()) { contentUi.imageView->setPixmap(item.payload<QPixmap>()); contentUi.stack->setCurrentWidget(contentUi.imageViewPage); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget.h new/akonadiconsole-18.04.0/src/browserwidget.h --- old/akonadiconsole-17.12.3/src/browserwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -49,6 +49,16 @@ class Monitor; class TagModel; class StatisticsProxyModel; +class ContactViewer; +class ContactGroupViewer; +} + +namespace CalendarSupport { +class IncidenceViewer; +} + +namespace MessageViewer { +class Viewer; } class BrowserWidget: public QWidget @@ -103,6 +113,11 @@ KToggleAction *mCacheOnlyAction = nullptr; QTreeView *mTagView = nullptr; Akonadi::TagModel *mTagModel = nullptr; + + Akonadi::ContactViewer *mContactView = nullptr; + Akonadi::ContactGroupViewer *mContactGroupView = nullptr; + CalendarSupport::IncidenceViewer *mIncidenceView = nullptr; + MessageViewer::Viewer *mMailView = nullptr; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget_contentview.ui new/akonadiconsole-18.04.0/src/browserwidget_contentview.ui --- old/akonadiconsole-17.12.3/src/browserwidget_contentview.ui 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget_contentview.ui 2018-04-10 13:50:39.000000000 +0200 @@ -94,58 +94,6 @@ </item> </layout> </widget> - <widget class="QWidget" name="contactViewPage"> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="Akonadi::ContactViewer" name="contactView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="contactGroupViewPage"> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <widget class="Akonadi::ContactGroupViewer" name="contactGroupView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="incidenceViewPage"> - <layout class="QVBoxLayout"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="CalendarSupport::IncidenceViewer" name="incidenceView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="mailViewPage"> - <layout class="QGridLayout" name="gridLayout1"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="MessageViewer::Viewer" name="mailView"/> - </item> - </layout> - </widget> </widget> </item> </layout> @@ -431,28 +379,6 @@ <header>keditlistwidget.h</header> <container>1</container> </customwidget> - <customwidget> - <class>CalendarSupport::IncidenceViewer</class> - <extends>QWidget</extends> - <header location="global">CalendarSupport/IncidenceViewer</header> - </customwidget> - <customwidget> - <class>MessageViewer::Viewer</class> - <extends>QTextBrowser</extends> - <header location="global">messageviewer/viewer.h</header> - </customwidget> - <customwidget> - <class>Akonadi::ContactViewer</class> - <extends>QWidget</extends> - <header location="global">Akonadi/Contact/ContactViewer</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Akonadi::ContactGroupViewer</class> - <extends>QWidget</extends> - <header location="global">Akonadi/Contact/ContactGroupViewer</header> - <container>1</container> - </customwidget> </customwidgets> <resources/> <connections/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/dbconsoletab.ui new/akonadiconsole-18.04.0/src/dbconsoletab.ui --- old/akonadiconsole-17.12.3/src/dbconsoletab.ui 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/dbconsoletab.ui 2018-04-10 13:50:39.000000000 +0200 @@ -73,7 +73,7 @@ <widget class="QWidget" name="layoutWidget"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="KPIMTextEdit::PlainTextEditorWidget" name="queryEdit"/> + <widget class="QPlainTextEdit" name="queryEdit"/> </item> <item> <widget class="QPushButton" name="execButton"> @@ -94,13 +94,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KPIMTextEdit::PlainTextEditorWidget</class> - <extends>QWidget</extends> - <header>kpimtextedit/plaintexteditorwidget.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/debugwidget.cpp new/akonadiconsole-18.04.0/src/debugwidget.cpp --- old/akonadiconsole-17.12.3/src/debugwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/debugwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -45,7 +45,7 @@ QString service = QStringLiteral("org.freedesktop.Akonadi"); if (Akonadi::ServerManager::hasInstanceIdentifier()) { - service += QLatin1String(".") + Akonadi::ServerManager::instanceIdentifier(); + service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier(); } mDebugInterface = new DebugInterface(service, QStringLiteral("/debug"), QDBusConnection::sessionBus(), this); QCheckBox *cb = new QCheckBox(QStringLiteral("Enable debugger"), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/instanceselector.cpp new/akonadiconsole-18.04.0/src/instanceselector.cpp --- old/akonadiconsole-17.12.3/src/instanceselector.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/instanceselector.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -26,7 +26,6 @@ #include <QIcon> #include <akonadi/private/instance_p.h> #include <akonadi/private/dbus_p.h> -#include <akonadi/private/xdgbasedirs_p.h> #include <QApplication> #include <QDBusConnection> @@ -96,15 +95,6 @@ } QDialog::accept(); - if (!m_instance.isEmpty()) { - QDBusInterface serverIface(QStringLiteral("org.freedesktop.Akonadi.%1").arg(m_instance), - QStringLiteral("/Server"), - QStringLiteral("org.freedesktop.Akonadi.Server"), - QDBusConnection::sessionBus()); - const QDBusReply<QString> serverPath = serverIface.call(QStringLiteral("serverPath")); - Akonadi::XdgBaseDirs::overrideConfigPath(serverPath); - } - qputenv("AKONADI_INSTANCE", m_instance.toUtf8()); Akonadi::Instance::setIdentifier(m_instance); MainWindow *mWindow = new MainWindow; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.cpp new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.cpp --- old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.h new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <montel(a)kde.org> + Copyright (C) 2017-2018 Montel Laurent <montel(a)kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/main.cpp new/akonadiconsole-18.04.0/src/main.cpp --- old/akonadiconsole-17.12.3/src/main.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/main.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -32,8 +32,6 @@ #include <QCommandLineOption> #include <QDBusMetaType> -#include <stdlib.h> - int main(int argc, char **argv) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); @@ -49,7 +47,7 @@ QStringLiteral("0.99"), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, - QStringLiteral("(c) 2006-2016 the Akonadi developer"), QString(), + QStringLiteral("(c) 2006-2018 the Akonadi developer"), QString(), QStringLiteral("https://community.kde.org/KDE_PIM/akonadi")); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("akonadi"))); aboutData.addAuthor(QStringLiteral("Tobias König"), QStringLiteral("Author"), QStringLiteral("tokoe(a)kde.org")); @@ -73,8 +71,8 @@ if (parser.isSet(QStringLiteral("remote"))) { const QString akonadiAddr = QStringLiteral("tcp:host=%1,port=31415").arg(parser.value(QStringLiteral("remote"))); const QString dbusAddr = QStringLiteral("tcp:host=%1,port=31416").arg(parser.value(QStringLiteral("remote"))); - setenv("AKONADI_SERVER_ADDRESS", akonadiAddr.toLatin1(), 1); - setenv("DBUS_SESSION_BUS_ADDRESS", dbusAddr.toLatin1(), 1); + qputenv("AKONADI_SERVER_ADDRESS", akonadiAddr.toLatin1()); + qputenv("DBUS_SESSION_BUS_ADDRESS", dbusAddr.toLatin1()); } InstanceSelector instanceSelector(parser.isSet(QStringLiteral("remote")) ? parser.value(QStringLiteral("remote")) : QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/mainwidget.cpp new/akonadiconsole-18.04.0/src/mainwidget.cpp --- old/akonadiconsole-17.12.3/src/mainwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/mainwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -21,11 +21,14 @@ #include "mainwidget.h" +#include "config-akonadiconsole.h" #include "agentwidget.h" #include "dbbrowser.h" #include "dbconsole.h" #include "debugwidget.h" +#ifdef ENABLE_SEARCH #include "searchwidget.h" +#endif #include "jobtrackerwidget.h" #include "notificationmonitor.h" #include "monitorswidget.h" @@ -63,7 +66,9 @@ tabWidget->addTab(new JobTrackerWidget("jobtracker", tabWidget, QStringLiteral("Enable job tracker")), QStringLiteral("Job Tracker")); tabWidget->addTab(new JobTrackerWidget("resourcesJobtracker", tabWidget, QStringLiteral("Enable tracking of Resource Schedulers")), QStringLiteral("Resources Schedulers")); tabWidget->addTab(new NotificationMonitor(tabWidget), QStringLiteral("Notification Monitor")); +#ifdef ENABLE_SEARCH tabWidget->addTab(new SearchWidget(tabWidget), QStringLiteral("Item Search")); +#endif tabWidget->addTab(new MonitorsWidget(tabWidget), QStringLiteral("Monitors")); auto action = parent->actionCollection()->addAction(QStringLiteral("akonadiconsole_akonadi2xml")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/mainwindow.cpp new/akonadiconsole-18.04.0/src/mainwindow.cpp --- old/akonadiconsole-17.12.3/src/mainwindow.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/mainwindow.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -20,8 +20,11 @@ */ #include "mainwindow.h" +#include "config-akonadiconsole.h" +#ifdef ENABLE_LIBKDEPIM #include <Libkdepim/UiStateSaver> +#endif #include <KActionCollection> #include <KConfigGroup> @@ -39,9 +42,9 @@ KStandardAction::quit(qApp, &QApplication::quit, actionCollection()); setupGUI(Keys /*| ToolBar | StatusBar*/ | Save | Create, QStringLiteral("akonadiconsoleui.rc")); - +#ifdef ENABLE_LIBKDEPIM KPIM::UiStateSaver::restoreState(this, KConfigGroup(KSharedConfig::openConfig(), "UiState")); - +#endif KMessageBox::information(this, QStringLiteral("Akonadi Console is purely a development tool. " "It allows you to view and change internal data structures of Akonadi. " "You should only change data in here if you know what you are doing, otherwise " @@ -57,8 +60,10 @@ void MainWindow::closeEvent(QCloseEvent *event) { +#ifdef ENABLE_LIBKDEPIM KConfigGroup config(KSharedConfig::openConfig(), "UiState"); KPIM::UiStateSaver::saveState(this, config); KSharedConfig::openConfig()->sync(); +#endif KXmlGuiWindow::closeEvent(event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-18.04.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-17.12.3/src/org.kde.akonadiconsole.desktop 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/org.kde.akonadiconsole.desktop 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Akonadi Console +Name[ar]=معراض أكونادي Name[ast]=Consola d'Akonadi Name[ca]=Consola de l'Akonadi Name[ca@valencia]=Consola de l'Akonadi @@ -33,6 +34,7 @@ Icon=akonadiconsole Type=Application Comment=Akonadi Management and Debugging Console +Comment[ar]=معراض لإدارة وتنقيح «أكونادي» Comment[ca]=Consola de gestió i depuració per a l'Akonadi Comment[ca@valencia]=Consola de gestió i depuració per a l'Akonadi Comment[cs]=Správa Akonadi a ladicí konzole diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/querydebugger.cpp new/akonadiconsole-18.04.0/src/querydebugger.cpp --- old/akonadiconsole-17.12.3/src/querydebugger.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/querydebugger.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -718,7 +718,7 @@ QString service = QStringLiteral("org.freedesktop.Akonadi"); if (Akonadi::ServerManager::hasInstanceIdentifier()) { - service += QLatin1String(".") + Akonadi::ServerManager::instanceIdentifier(); + service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier(); } mDebugger = new org::freedesktop::Akonadi::StorageDebugger(service, QStringLiteral("/storageDebug"), QDBusConnection::sessionBus(), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/searchwidget.cpp new/akonadiconsole-18.04.0/src/searchwidget.cpp --- old/akonadiconsole-17.12.3/src/searchwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/searchwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -29,7 +29,6 @@ #include <AkonadiCore/itemfetchscope.h> #include <AkonadiCore/itemsearchjob.h> #include <AkonadiCore/SearchQuery> -#include <kpimtextedit/plaintexteditorwidget.h> #include <AkonadiSearch/Core/searchstore.h> @@ -38,6 +37,7 @@ #include <KComboBox> #include <KMessageBox> #include <QTextBrowser> +#include <QPlainTextEdit> #include <KSharedConfig> #include <KConfigGroup> @@ -72,7 +72,7 @@ auto w = new QWidget; QVBoxLayout *vbox = new QVBoxLayout(w); vbox->addWidget(new QLabel(QStringLiteral("Search query:"))); - mQueryWidget = new KPIMTextEdit::PlainTextEditorWidget; + mQueryWidget = new QPlainTextEdit; vbox->addWidget(mQueryWidget); mVSplitter->addWidget(w); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/searchwidget.h new/akonadiconsole-18.04.0/src/searchwidget.h --- old/akonadiconsole-17.12.3/src/searchwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/searchwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -33,10 +33,8 @@ class QStandardItemModel; class QTreeView; class QSplitter; -namespace KPIMTextEdit -{ -class PlainTextEditorWidget; -} +class QPlainTextEdit; + namespace Xapian { class Database; class Error; @@ -58,10 +56,10 @@ private: void xapianError(const Xapian::Error &e); - + KComboBox *mStoreCombo = nullptr; QTextBrowser *mItemView = nullptr; - KPIMTextEdit::PlainTextEditorWidget *mQueryWidget = nullptr; + QPlainTextEdit *mQueryWidget = nullptr; QListView *mDatabaseView = nullptr; QStandardItemModel *mDocumentModel = nullptr; QTreeView *mDocumentView = nullptr;

1 0

commit lollypop for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2018-04-27 16:01:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lollypop" Fri Apr 27 16:01:23 2018 rev:35 rq:598814 version:0.9.506 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2018-04-16 12:50:14.958361803 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop.new/lollypop.changes 2018-04-27 16:01:24.963694392 +0200 @@ -1,0 +2,12 @@ +Thu Apr 19 16:37:21 UTC 2018 - antoine.belvire(a)opensuse.org + +- Update to version 0.9.506: + * Create information store on init. Fix #1402. +- Update to version 0.9.505: + * Rework all Shuffle code. + * Add some blur to lyrics view. + * Import playlists from disk. + * Allow exporting playlists to disk. + * Bug fixes. + +------------------------------------------------------------------- Old: ---- lollypop-0.9.504.tar.xz New: ---- lollypop-0.9.506.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.Zi3c2I/_old 2018-04-27 16:01:25.659668851 +0200 +++ /var/tmp/diff_new_pack.Zi3c2I/_new 2018-04-27 16:01:25.663668704 +0200 @@ -18,7 +18,7 @@ %global gobject_introspection_version 1.35.9 Name: lollypop -Version: 0.9.504 +Version: 0.9.506 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Zi3c2I/_old 2018-04-27 16:01:25.695667530 +0200 +++ /var/tmp/diff_new_pack.Zi3c2I/_new 2018-04-27 16:01:25.695667530 +0200 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">0.9.504</param> + <param name="revision">0.9.506</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/gnumdk/lollypop.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Zi3c2I/_old 2018-04-27 16:01:25.715666796 +0200 +++ /var/tmp/diff_new_pack.Zi3c2I/_new 2018-04-27 16:01:25.715666796 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/gnumdk/lollypop.git</param> - <param name="changesrevision">859d0463a5c76cdfb2de7b36b2a70cd6c55bb335</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">28cfaeab043d70750063f3bca290ee2936c9c637</param></service></servicedata> \ No newline at end of file ++++++ lollypop-0.9.504.tar.xz -> lollypop-0.9.506.tar.xz ++++++ ++++ 9694 lines of diff (skipped)

1 0

commit lollypop-portal for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package lollypop-portal for openSUSE:Factory checked in at 2018-04-27 16:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop-portal (Old) and /work/SRC/openSUSE:Factory/.lollypop-portal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lollypop-portal" Fri Apr 27 16:01:21 2018 rev:7 rq:598813 version:0.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop-portal/lollypop-portal.changes 2018-03-30 12:08:29.299422371 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop-portal.new/lollypop-portal.changes 2018-04-27 16:01:23.843735494 +0200 @@ -1,0 +2,8 @@ +Thu Apr 19 17:12:09 UTC 2018 - antoine.belvire(a)opensuse.org + +- Fix shebang replacement: + * We want '#!/usr/bin python3', not '#!/usr/bin/python3 python3'. +- Use %license instead of %doc for license file (boo#1082318). +- Clean with spec-cleaner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop-portal.spec ++++++ --- /var/tmp/diff_new_pack.XID7tl/_old 2018-04-27 16:01:24.339717292 +0200 +++ /var/tmp/diff_new_pack.XID7tl/_new 2018-04-27 16:01:24.343717145 +0200 @@ -22,15 +22,13 @@ Summary: Lollypop flatpak portal (advanced features for Lollypop) License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players -Url: https://gitlab.gnome.org/gnumdk/lollypop-portal +URL: https://gitlab.gnome.org/gnumdk/lollypop-portal Source: %{name}-%{version}.tar.xz -BuildRequires: gobject-introspection-devel -BuildRequires: meson -BuildRequires: ninja +BuildRequires: meson >= 0.40 BuildRequires: pkgconfig +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.35.9 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 BuildRequires: pkgconfig(python3) -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -38,18 +36,18 @@ %prep %setup -q +sed -E -i "s|/usr/bin/env python3|/usr/bin/python3|g" lollypop-portal.in %build %meson +%meson_build %install %meson_install -sed -E -i "s|/usr/bin/env|/usr/bin/python3|g" %{buildroot}%{_libexecdir}/lollypop-portal - %files -%defattr(-,root,root) -%doc LICENSE README.md +%doc README.md +%license LICENSE %{_datadir}/dbus-1/services/org.gnome.Lollypop.Portal.service %{_libexecdir}/lollypop-portal

1 0

commit inkscape for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2018-04-27 16:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "inkscape" Fri Apr 27 16:00:47 2018 rev:94 rq:601077 version:0.92.3 Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2018-03-12 12:05:55.335925844 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2018-04-27 16:00:52.420888707 +0200 @@ -1,0 +2,31 @@ +Wed Apr 25 02:38:43 UTC 2018 - stefan.bruens(a)rwth-aachen.de + +- Omit translations from appdata on Leap 42.x/SLE12, merging + translations in XML requires msgfmt >= 0.19.7 + +------------------------------------------------------------------- +Tue Apr 24 17:41:35 UTC 2018 - stefan.bruens(a)rwth-aachen.de + +- Update to 0.92.3, a stability and bugfix release + * new CLI options --export-area-{drawing,page}, --export-margin + * Text tool, switching between RTL/LTR writing + * Circle/Ellipse tool, toolbar fields for Rx, Ry radius + * PDF+LaTeX export, basic linespacing support + * Preferences option for number of rendering tiles + * Various bug fixes, for details see: + https://inkscape.org/en/release/0.92.3/ +- Drop obsolete inkscape-poppler058-fix.patch +- Use cmake instead of autoconf + * Add build_internal_libraries_as_static.patch + * Add fix_install_targets.patch +- Spec file cleanup + * Remove conditionals for EOLed distributions + * Remove ghostscript-fonts-std dependency + * Add libjpeg build dependency + * Do not package extension unittests + * Move all extensions with ghostscript or pstoedit dependency + to extensions-extra subpackage +- Correct License, original inkscape code is GPL-2.0 or later, but + the binary contains code from Gimp (GPL-3.0), see COPYING + +------------------------------------------------------------------- Old: ---- inkscape-0.92.2.tar.bz2 inkscape-poppler058-fix.patch New: ---- build_internal_libraries_as_static.patch fix_install_targets.patch inkscape-0.92.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.biEMtk/_old 2018-04-27 16:00:53.640843934 +0200 +++ /var/tmp/diff_new_pack.biEMtk/_new 2018-04-27 16:00:53.640843934 +0200 @@ -1,7 +1,7 @@ # # spec file for package inkscape # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX 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,29 +17,30 @@ Name: inkscape -Version: 0.92.2 +Version: 0.92.3 Release: 0 Summary: Vector Illustration Program -License: GPL-2.0 and LGPL-2.1 +License: GPL-3.0 Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ -Source: https://inkscape.global.ssl.fastly.net/media/resources/file/%{name}-%{versi… +Source: https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar.bz2 # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh # PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec(a)suse.cz -- Suggest packages instead of compilation from source. Patch0: inkscape-packages.patch -# PATCH-FIX-UPSTREAM inkscape-poppler058-fix.patch lp#1715820 zaitor(a)opensuse.org -- Adapt to poppler 0.58 -Patch1: inkscape-poppler058-fix.patch +# PATCH-FIX-OPENSUSE build_internal_libraries_as_static.patch -- Avoid problems with dynamic library default from %%cmake macro +Patch1: build_internal_libraries_as_static.patch +# PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc. +Patch2: fix_install_targets.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gtkspell-devel %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gc-devel BuildRequires: gcc-c++ @@ -61,17 +62,13 @@ BuildRequires: python2-xml BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(libexif) -%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(libcdr-0.1) -BuildRequires: pkgconfig(libvisio-0.1) -%endif +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libwpg-0.3) -Requires: %{_bindir}/gs -Requires: ghostscript-fonts-std -Requires: gzip -Requires: pstoedit Requires: python-gtk Recommends: %{name}-lang Recommends: python-lxml @@ -79,7 +76,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-extra Summary: Vector Illustration Program - Extra Extensions @@ -91,17 +88,17 @@ Requires: python-xml # for cdr and wmf modules Recommends: yudit +# dxf_output.inx, eqtexsvg.inx: +Requires: pstoedit Enhances: %{name} # python-xml is already likely installed, so the big dependency is python-lxml. Hence this supplements. Supplements: packageand(%{name}:python-lxml) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/inkex.py %description extensions-extra Extra extensions for Inkscape. Recommended for everybody who wants to use Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-dia Summary: Vector Illustration Program - Dia Import Extension @@ -110,13 +107,11 @@ Requires: dia Enhances: %{name} Supplements: packageand(%{name}:dia) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/dia.inx %description extensions-dia Dia import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-fig Summary: Vector Illustration Program - Fig Import Extension @@ -125,30 +120,25 @@ Requires: transfig Enhances: %{name} Supplements: packageand(%{name}:transfig) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/fig_input.inx %description extensions-fig Fig family (XFig, Figurine, JFig, WinFig,...) import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-gimp Summary: Vector Illustration Program - The GIMP Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} -Requires: gimp-2.0 +Requires: gimp Enhances: %{name} Supplements: packageand(%{name}:gimp) -Supplements: packageand(%{name}:gimp-2.0) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/gimp_xcf.inx %description extensions-gimp The GIMP import and export extensions for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-skencil Summary: Vector Illustration Program - Skencil Import Extension @@ -157,13 +147,11 @@ Requires: skencil Enhances: %{name} Supplements: packageand(%{name}:skencil) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/sk_input.inx %description extensions-skencil Skencil import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %lang_package @@ -171,27 +159,30 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -./autogen.sh -RPM_OPT_FLAGS="%{optflags}" %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -export CFLAGS="%{optflags} -fno-strict-aliasing" -# This (-std=c++11) is still needed with gcc6 until this is fixed: -# https://bugs.launchpad.net/inkscape/+bug/1488079 -export CXXFLAGS="%{optflags} -std=c++11 -fno-strict-aliasing" - -%configure\ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-strict-build +%cmake +%{make_jobs} -make %{?_smp_mflags} +# Unmangle XML and merge translations +# Currently missing from CMake build (https://bugs.launchpad.net/inkscape/+bug/1710337) +(cd .. +sed -ie 's:<_:<:g; s:</_:</:g' inkscape.appdata.xml.in +# msgfmt --xml ... is available since 0.19.7 +%if 0%{?suse_version} >= 1500 +msgfmt --xml -d ./po/ --template inkscape.appdata.xml.in -o inkscape.appdata.xml +%else +cp inkscape.appdata.xml.in inkscape.appdata.xml +%endif +) %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%cmake_install + rm -rf %{buildroot}%{_datadir}/locale/en_US@piglatin rm -rf %{buildroot}%{_datadir}/inkscape/filters/filters.svg.h rm -rf %{buildroot}%{_datadir}/inkscape/patterns/patterns.svg.h @@ -205,6 +196,8 @@ rm -rf %{buildroot}%{_datadir}/inkscape/extensions/simplepath.rb # only required on Windows rm -rf %{buildroot}%{_datadir}/inkscape/extensions/print_win32_vector.* +# packaging/distribution info +rm -rf %{buildroot}%{_datadir}/inkscape/extensions/README install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/inkscape/palettes @@ -212,22 +205,27 @@ %find_lang %{name} %{?no_lang_C} +# split extensions bash %{SOURCE2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/" sed -i -e "1 s,#! */usr/bin/env python,#!/usr/bin/python2," %{buildroot}%{_datadir}/inkscape/extensions/*.py -# Localized man pages -for man in %{buildroot}%{_mandir}/*/man1/*; do - LOCALE=`echo $man | sed "s:.*%{_mandir}/$[^/]*$/man1/.*:\1:g"` +# Localized man pages, correct install path +for man in %{buildroot}%{_mandir}/man1/inkscape.*.1; do + LOCALE=`echo $man | sed "s:.*%{_mandir}/man1/.*\.$[a-zA-Z_]\+$\.1:\1:g"` + mkdir -m755 -p %{buildroot}%{_mandir}/$LOCALE/man1 + mv $man %{buildroot}%{_mandir}/$LOCALE/man1/%{name}.1 echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp - echo "%%lang($LOCALE) %%doc /${man##%{buildroot}}*" >> %{name}.man-lang.tmp + echo "%%lang($LOCALE) %%doc %%{_mandir}/$LOCALE/man1/inkscape.1*" >> %{name}.man-lang.tmp done sort -u %{name}.man-lang.tmp > %{name}.man-lang rm %{name}.man-lang.tmp -%fdupes %{buildroot} -%if 0%{?suse_version} > 1130 +# Install appdata +install -D -m 0644 inkscape.appdata.xml %{buildroot}%{_datadir}/metainfo/inkscape.appdata.xml + +%fdupes %{buildroot} %post %desktop_database_post @@ -236,7 +234,6 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif # We can't really move the localized manpages to the lang package, since they'd # create a conflict between the lang subpackage and bundles @@ -244,10 +241,11 @@ %files -f inkscape.lst -f %{name}.man-lang %defattr(-,root,root) %{_bindir}/* +%{_libdir}/libinkscape_base.so %{_datadir}/applications/inkscape.desktop %{_datadir}/icons/hicolor/*/apps/inkscape.png -%dir %{_datadir}/appdata -%{_datadir}/appdata/inkscape.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/inkscape.appdata.xml %dir %{_datadir}/inkscape %{_datadir}/inkscape/[cf-z]* %{_datadir}/inkscape/examples @@ -256,7 +254,6 @@ %{_datadir}/inkscape/extensions/xaml2svg %{_datadir}/inkscape/extensions/*.xsl* %{_datadir}/inkscape/extensions/colors.xml -%{_datadir}/inkscape/extensions/ps2* %{_datadir}/inkscape/extensions/Poly3DObjects/ %{_datadir}/inkscape/extensions/alphabet_soup/ %{_datadir}/inkscape/extensions/inkweb.js @@ -268,29 +265,34 @@ %{_datadir}/inkscape/extensions/ink2canvas/* %{_datadir}/inkscape/extensions/inkscape.extension.rng %{_datadir}/inkscape/extensions/seamless_pattern.svg -%{_datadir}/inkscape/extensions/test -%{_datadir}/inkscape/extensions/test/svg %{_datadir}/inkscape/attributes/ %{_datadir}/inkscape/branding/ %doc %{_mandir}/man?/*.* # exclude extensions that go in other packages: %exclude %{_datadir}/inkscape/extensions/Barcode +%exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py +%exclude %{_datadir}/inkscape/extensions/ps_input.inx +%exclude %{_datadir}/inkscape/extensions/eps_input.inx %exclude %{_datadir}/inkscape/extensions/cdr* %exclude %{_datadir}/inkscape/extensions/wmf* %exclude %{_datadir}/inkscape/extensions/dia* %exclude %{_datadir}/inkscape/extensions/fig* %exclude %{_datadir}/inkscape/extensions/*gimp* %exclude %{_datadir}/inkscape/extensions/sk* +%exclude %{_datadir}/inkscape/extensions/*dxf* # this one is in extras, manually added there due to large dependencies on ghostscript %exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py %files extensions-extra -f inkscape-extensions-extra.lst %defattr(-,root,root) %{_datadir}/inkscape/extensions/Barcode -%{_datadir}/inkscape/extensions/cdr* # ps2pdf-ext is a wrapper around ps2pdf binary (part of ghostscript) +%{_datadir}/inkscape/extensions/ps_input.inx +%{_datadir}/inkscape/extensions/eps_input.inx %{_datadir}/inkscape/extensions/ps2pdf-ext.py -%{_datadir}/inkscape/extensions/wmf* +# ps2dxf is a wrapper around pstoedit +%{_datadir}/inkscape/extensions/dxf_output.inx +%{_datadir}/inkscape/extensions/ps2dxf.sh # This extensions seems erronous being copied in here too. %exclude %{_datadir}/inkscape/extensions/*gimp* %exclude %{_datadir}/inkscape/extensions/sk* ++++++ build_internal_libraries_as_static.patch ++++++ --- inkscape-0.92.3/CMakeScripts/HelperMacros.cmake_orig 2018-04-24 21:00:20.000562424 +0200 +++ inkscape-0.92.3/CMakeScripts/HelperMacros.cmake 2018-04-24 21:00:30.300534272 +0200 @@ -29,7 +29,7 @@ name sources) - add_library(${name} ${sources}) + add_library(${name} STATIC ${sources}) # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) ++++++ fix_install_targets.patch ++++++ --- inkscape-0.92.3/CMakeScripts/HelperMacros.cmake_orig 2018-04-24 21:28:19.299976294 +0200 +++ inkscape-0.92.3/CMakeScripts/HelperMacros.cmake 2018-04-24 21:00:30.300534272 +0200 @@ -37,7 +37,7 @@ # static libraries are probably not useful on Windows # (if we ever build shared libraries those would use the RUNTIME target and we might have to revisit this) - if(NOT WIN32) + if(0) install(TARGETS ${name} LIBRARY DESTINATION lib/inkscape ARCHIVE DESTINATION lib/inkscape --- inkscape-0.92.3/src/CMakeLists.txt_orig 2018-04-24 21:21:17.069106797 +0200 +++ inkscape-0.92.3/src/CMakeLists.txt 2018-04-24 21:26:42.844223886 +0200 @@ -575,9 +575,8 @@ inkscape_base inkscape inkview - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape) + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) else() install(TARGETS inkscape_base ++++++ inkscape-0.92.2.tar.bz2 -> inkscape-0.92.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/inkscape/inkscape-0.92.2.tar.bz2 /work/SRC/openSUSE:Factory/.inkscape.new/inkscape-0.92.3.tar.bz2 differ: char 11, line 1

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2018-04-27 16:00:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen" Fri Apr 27 16:00:36 2018 rev:246 rq:601072 version:4.10.0_18 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2018-03-30 12:00:43.480265750 +0200 +++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2018-04-27 16:00:39.633358022 +0200 @@ -1,0 +2,16 @@ +Mon Apr 16 14:03:24 MDT 2018 - carnold(a)suse.com + +- bsc#1089152 - VUL-0: xen: Information leak via crafted + user-supplied CDROM (XSA-258) + xsa258.patch +- bsc#1089635 - VUL-0: xen: x86: PV guest may crash Xen with XPTI + (XSA-259) + xsa259.patch + +------------------------------------------------------------------- +Wed Mar 28 08:28:59 UTC 2018 - ohering(a)suse.de + +- Preserve xen-syms from xen-dbg.gz to allow processing vmcores + with crash(1) (bsc#1087251) + +------------------------------------------------------------------- New: ---- xsa258.patch xsa259.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:46.281114042 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:46.289113748 +0200 @@ -126,7 +126,7 @@ BuildRequires: pesign-obs-integration %endif -Version: 4.10.0_16 +Version: 4.10.0_18 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0 @@ -224,6 +224,8 @@ Patch61: 5a9eb890-x86-remove-CR-reads-from-exit-to-guest-path.patch Patch62: 5aa2b6b9-cpufreq-ondemand-CPU-offlining-race.patch Patch63: 5aaa9878-x86-vlapic-clear-TMR-bit-for-edge-triggered-intr.patch +Patch258: xsa258.patch +Patch259: xsa259.patch # Our platform specific patches Patch400: xen-destdir.patch Patch401: vif-bridge-no-iptables.patch @@ -477,6 +479,8 @@ %patch61 -p1 %patch62 -p1 %patch63 -p1 +%patch258 -p1 +%patch259 -p1 # Our platform specific patches %patch400 -p1 %patch401 -p1 @@ -815,6 +819,8 @@ find $RPM_BUILD_ROOT/boot -ls if [ -n "$1" ]; then ext="-$1" + mv $RPM_BUILD_ROOT/boot/xen-syms-${XEN_FULLVERSION} \ + $RPM_BUILD_ROOT/boot/xen-syms${ext}-${XEN_FULLVERSION} mv $RPM_BUILD_ROOT/boot/xen-${XEN_FULLVERSION}%{xen_install_suffix} \ $RPM_BUILD_ROOT/boot/xen${ext}-${XEN_FULLVERSION}%{xen_install_suffix} if test -d $RPM_BUILD_ROOT%{_libdir}/efi; then ++++++ libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:47.845056643 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:47.849056497 +0200 @@ -87,7 +87,7 @@ =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_dm.c +++ xen-4.10.0-testing/tools/libxl/libxl_dm.c -@@ -805,6 +805,19 @@ enum { +@@ -792,6 +792,19 @@ enum { LIBXL__COLO_SECONDARY, }; @@ -107,7 +107,7 @@ static char *qemu_disk_scsi_drive_string(libxl__gc *gc, const char *target_path, int unit, const char *format, const libxl_device_disk *disk, -@@ -818,8 +831,8 @@ static char *qemu_disk_scsi_drive_string +@@ -805,8 +818,8 @@ static char *qemu_disk_scsi_drive_string switch (colo_mode) { case LIBXL__COLO_NONE: drive = libxl__sprintf @@ -118,7 +118,7 @@ break; case LIBXL__COLO_PRIMARY: /* -@@ -832,13 +845,15 @@ static char *qemu_disk_scsi_drive_string +@@ -819,13 +832,15 @@ static char *qemu_disk_scsi_drive_string * vote-threshold=1 */ drive = GCSPRINTF( @@ -136,7 +136,7 @@ break; case LIBXL__COLO_SECONDARY: /* -@@ -852,7 +867,7 @@ static char *qemu_disk_scsi_drive_string +@@ -839,7 +854,7 @@ static char *qemu_disk_scsi_drive_string * file.backing.backing=exportname, */ drive = GCSPRINTF( @@ -145,7 +145,7 @@ "driver=replication," "mode=secondary," "top-id=top-colo," -@@ -861,7 +876,9 @@ static char *qemu_disk_scsi_drive_string +@@ -848,7 +863,9 @@ static char *qemu_disk_scsi_drive_string "file.backing.driver=qcow2," "file.backing.file.filename=%s," "file.backing.backing=%s", @@ -156,7 +156,7 @@ break; default: abort(); -@@ -883,8 +900,8 @@ static char *qemu_disk_ide_drive_string( +@@ -870,8 +887,8 @@ static char *qemu_disk_ide_drive_string( switch (colo_mode) { case LIBXL__COLO_NONE: drive = GCSPRINTF @@ -167,7 +167,7 @@ break; case LIBXL__COLO_PRIMARY: /* -@@ -897,13 +914,15 @@ static char *qemu_disk_ide_drive_string( +@@ -884,13 +901,15 @@ static char *qemu_disk_ide_drive_string( * vote-threshold=1 */ drive = GCSPRINTF( @@ -185,7 +185,7 @@ break; case LIBXL__COLO_SECONDARY: /* -@@ -917,7 +936,7 @@ static char *qemu_disk_ide_drive_string( +@@ -904,7 +923,7 @@ static char *qemu_disk_ide_drive_string( * file.backing.backing=exportname, */ drive = GCSPRINTF( @@ -194,7 +194,7 @@ "driver=replication," "mode=secondary," "top-id=top-colo," -@@ -926,7 +945,9 @@ static char *qemu_disk_ide_drive_string( +@@ -913,7 +932,9 @@ static char *qemu_disk_ide_drive_string( "file.backing.driver=qcow2," "file.backing.file.filename=%s," "file.backing.backing=%s", @@ -205,7 +205,7 @@ break; default: abort(); -@@ -1605,8 +1626,8 @@ static int libxl__build_device_model_arg +@@ -1592,8 +1613,8 @@ static int libxl__build_device_model_arg return ERROR_INVAL; } flexarray_vappend(dm_args, "-drive", ++++++ libxl.pvscsi.patch ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:47.865055910 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:47.869055763 +0200 @@ -226,7 +226,7 @@ =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.10.0-testing/tools/libxl/libxl_internal.h -@@ -3579,6 +3579,7 @@ extern const struct libxl_device_type li +@@ -3580,6 +3580,7 @@ extern const struct libxl_device_type li extern const struct libxl_device_type libxl__disk_devtype; extern const struct libxl_device_type libxl__nic_devtype; extern const struct libxl_device_type libxl__vtpm_devtype; ++++++ libxl.set-migration-constraints-from-cmdline.patch ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:47.889055029 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:47.889055029 +0200 @@ -395,7 +395,7 @@ =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.10.0-testing/tools/libxl/libxl_internal.h -@@ -3293,6 +3293,10 @@ struct libxl__domain_save_state { +@@ -3294,6 +3294,10 @@ struct libxl__domain_save_state { /* private */ int rc; int hvm; ++++++ xen.libxl.dmmd.patch ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:48.097047395 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:48.097047395 +0200 @@ -49,7 +49,7 @@ =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_dm.c +++ xen-4.10.0-testing/tools/libxl/libxl_dm.c -@@ -956,6 +956,30 @@ static char *qemu_disk_ide_drive_string( +@@ -943,6 +943,30 @@ static char *qemu_disk_ide_drive_string( return drive; } @@ -80,7 +80,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, -@@ -1523,9 +1547,11 @@ static int libxl__build_device_model_arg +@@ -1510,9 +1534,11 @@ static int libxl__build_device_model_arg libxl__device_disk_dev_number(disks[i].vdev, &disk, &part); const char *format; char *drive; @@ -93,7 +93,7 @@ if (dev_number == -1) { LOGD(WARN, guest_domid, "unable to determine"" disk number for %s", disks[i].vdev); -@@ -1566,7 +1592,7 @@ static int libxl__build_device_model_arg +@@ -1553,7 +1579,7 @@ static int libxl__build_device_model_arg * the bootloader path. */ if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) @@ -119,7 +119,7 @@ =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.10.0-testing/tools/libxl/libxl_internal.h -@@ -1758,6 +1758,10 @@ _hidden char *libxl__blktap_devpath(libx +@@ -1759,6 +1759,10 @@ _hidden char *libxl__blktap_devpath(libx */ _hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params); ++++++ xen2libvirt.py ++++++ --- /var/tmp/diff_new_pack.bxKPP6/_old 2018-04-27 16:00:48.125046367 +0200 +++ /var/tmp/diff_new_pack.bxKPP6/_new 2018-04-27 16:00:48.125046367 +0200 @@ -52,7 +52,7 @@ isbinary = os.system('file -b ' + path + ' | grep text > /dev/null') if isbinary: - print(('Skipping %s (not a valid Xen configuration file)' % path)) + print('Skipping %s (not a valid Xen configuration file)' % path) return 'unknown' for line in config.splitlines(): @@ -62,14 +62,14 @@ # XML is not a supported conversion format break if line.startswith('(domain'): - print(('Found sexpr formatted file %s' % path)) + print('Found sexpr formatted file %s' % path) return 'sexpr' if '=' in line: - print(('Found xm formatted file %s' % path)) + print('Found xm formatted file %s' % path) return 'xm' break - print(('Skipping %s (not a valid Xen configuration file)' % path)) + print('Skipping %s (not a valid Xen configuration file)' % path) return 'unknown' @@ -131,7 +131,7 @@ print_verbose('Processing file %s' % abs_name) import_domain(conn, abs_name, args.format, args.convert_only) except IOError: - print(('Failed to open/read path %s' % path)) + print('Failed to open/read path %s' % path) sys.exit(1) else: import_domain(conn, args.path, args.format, args.convert_only) ++++++ xsa258.patch ++++++ >From bf9ab0ec0b632739fe6366391e89a7d4dcf9993b Mon Sep 17 00:00:00 2001 From: Anthony PERARD <anthony.perard(a)citrix.com> Date: Thu, 8 Mar 2018 18:16:41 +0000 Subject: [PATCH] libxl: Specify format of inserted cdrom Without this extra parameter on the QMP command, QEMU will guess the format of the new file. This is XSA-258. Signed-off-by: Anthony PERARD <anthony.perard(a)citrix.com> Acked-by: Ian Jackson <ian.jackson(a)eu.citrix.com> --- tools/libxl/libxl_device.c | 13 +++++++++++++ tools/libxl/libxl_dm.c | 17 ++--------------- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_qmp.c | 2 ++ 4 files changed, 18 insertions(+), 15 deletions(-) Index: xen-4.10.0-testing/tools/libxl/libxl_device.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_device.c +++ xen-4.10.0-testing/tools/libxl/libxl_device.c @@ -430,6 +430,19 @@ char *libxl__device_disk_string_of_backe } } +const char *libxl__qemu_disk_format_string(libxl_disk_format format) +{ + switch (format) { + case LIBXL_DISK_FORMAT_QCOW: return "qcow"; + case LIBXL_DISK_FORMAT_QCOW2: return "qcow2"; + case LIBXL_DISK_FORMAT_VHD: return "vpc"; + case LIBXL_DISK_FORMAT_RAW: return "raw"; + case LIBXL_DISK_FORMAT_EMPTY: return NULL; + case LIBXL_DISK_FORMAT_QED: return "qed"; + default: return NULL; + } +} + int libxl__device_physdisk_major_minor(const char *physpath, int *major, int *minor) { struct stat buf; Index: xen-4.10.0-testing/tools/libxl/libxl_dm.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_dm.c +++ xen-4.10.0-testing/tools/libxl/libxl_dm.c @@ -677,19 +677,6 @@ static int libxl__build_device_model_arg return 0; } -static const char *qemu_disk_format_string(libxl_disk_format format) -{ - switch (format) { - case LIBXL_DISK_FORMAT_QCOW: return "qcow"; - case LIBXL_DISK_FORMAT_QCOW2: return "qcow2"; - case LIBXL_DISK_FORMAT_VHD: return "vpc"; - case LIBXL_DISK_FORMAT_RAW: return "raw"; - case LIBXL_DISK_FORMAT_EMPTY: return NULL; - case LIBXL_DISK_FORMAT_QED: return "qed"; - default: return NULL; - } -} - static char *dm_spice_options(libxl__gc *gc, const libxl_spice_info *spice) { @@ -1516,9 +1503,9 @@ static int libxl__build_device_model_arg * always raw */ if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) - format = qemu_disk_format_string(disks[i].format); + format = libxl__qemu_disk_format_string(disks[i].format); else - format = qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); + format = libxl__qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { if (!disks[i].is_cdrom) { Index: xen-4.10.0-testing/tools/libxl/libxl_internal.h =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.10.0-testing/tools/libxl/libxl_internal.h @@ -1198,6 +1198,7 @@ _hidden int libxl__domain_pvcontrol_writ /* from xl_device */ _hidden char *libxl__device_disk_string_of_backend(libxl_disk_backend backend); _hidden char *libxl__device_disk_string_of_format(libxl_disk_format format); +_hidden const char *libxl__qemu_disk_format_string(libxl_disk_format format); _hidden int libxl__device_disk_set_backend(libxl__gc*, libxl_device_disk*); _hidden int libxl__device_physdisk_major_minor(const char *physpath, int *major, int *minor); Index: xen-4.10.0-testing/tools/libxl/libxl_qmp.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_qmp.c +++ xen-4.10.0-testing/tools/libxl/libxl_qmp.c @@ -982,6 +982,8 @@ int libxl__qmp_insert_cdrom(libxl__gc *g return qmp_run_command(gc, domid, "eject", args, NULL, NULL); } else { qmp_parameters_add_string(gc, &args, "target", disk->pdev_path); + qmp_parameters_add_string(gc, &args, "arg", + libxl__qemu_disk_format_string(disk->format)); return qmp_run_command(gc, domid, "change", args, NULL, NULL); } } ++++++ xsa259.patch ++++++ From: Jan Beulich <jbeulich(a)suse.com> Subject: x86: fix slow int80 path after XPTI additions For the int80 slow path to jump to handle_exception_saved, %r14 needs to be set up suitably for XPTI purposes. This is because of the difference in nature between the int80 path (which is synchronous WRT guest actions) and the exception path which is potentially asynchronous. This is XSA-259. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Index: xen-4.10.0-testing/xen/arch/x86/x86_64/entry.S =================================================================== --- xen-4.10.0-testing.orig/xen/arch/x86/x86_64/entry.S +++ xen-4.10.0-testing/xen/arch/x86/x86_64/entry.S @@ -372,6 +372,12 @@ int80_slow_path: movl $TRAP_gp_fault,UREGS_entry_vector(%rsp) /* A GPF wouldn't have incremented the instruction pointer. */ subq $2,UREGS_rip(%rsp) + /* + * While we've cleared xen_cr3 above already, normal exception handling + * code has logic to restore the original value from %r15. Therefore we + * need to set up %r14 here, while %r15 is required to still be zero. + */ + GET_STACK_END(14) jmp handle_exception_saved /* create_bounce_frame & helpers don't need to be in .text.entry */

1 0