Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2013-07-08 07:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2013-06-11 09:32:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2013-07-08 07:28:49.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:50:18 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 20:52:59 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- ksirk-4.10.4.tar.xz New: ---- ksirk-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.ScM7R5/_old 2013-07-08 07:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ScM7R5/_new 2013-07-08 07:28:51.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ ksirk-4.10.4.tar.xz -> ksirk-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/TODO new/ksirk-4.10.90/TODO --- old/ksirk-4.10.4/TODO 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/TODO 2013-06-10 20:55:04.000000000 +0200 @@ -120,7 +120,7 @@ implemented) ; - [DONE] hability to save game at any point - [DONE] use khotnewstuff for new skins - - use GGZ or Jabber to offer or find network games + - use Jabber to offer or find network games Middle to long term: - game periods (distribution of armies, attacks, ...) should be simultaneous diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/doc/Makefile.am new/ksirk-4.10.90/doc/Makefile.am --- old/ksirk-4.10.4/doc/Makefile.am 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -####### kdevelop will overwrite this part!!! (begin)########## - - -EXTRA_DIST = index.docbook - -####### kdevelop will overwrite this part!!! (end)############ - -KDE_LANG = en -KDE_DOCS = ksirk - Files old/ksirk-4.10.4/doc/attackOne.png and new/ksirk-4.10.90/doc/attackOne.png differ Files old/ksirk-4.10.4/doc/attackThree.png and new/ksirk-4.10.90/doc/attackThree.png differ Files old/ksirk-4.10.4/doc/attackTwo.png and new/ksirk-4.10.90/doc/attackTwo.png differ Files old/ksirk-4.10.4/doc/attackmenu.png and new/ksirk-4.10.90/doc/attackmenu.png differ Files old/ksirk-4.10.4/doc/autoattack.png and new/ksirk-4.10.90/doc/autoattack.png differ Files old/ksirk-4.10.4/doc/defensedialog.png and new/ksirk-4.10.90/doc/defensedialog.png differ Files old/ksirk-4.10.4/doc/displaygoalmessage.png and new/ksirk-4.10.90/doc/displaygoalmessage.png differ Files old/ksirk-4.10.4/doc/displaygoalwarningmessage.png and new/ksirk-4.10.90/doc/displaygoalwarningmessage.png differ Files old/ksirk-4.10.4/doc/firing-screenshot.png and new/ksirk-4.10.90/doc/firing-screenshot.png differ Files old/ksirk-4.10.4/doc/index.cache.bz2 and new/ksirk-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/doc/index.docbook new/ksirk-4.10.90/doc/index.docbook --- old/ksirk-4.10.4/doc/index.docbook 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/doc/index.docbook 2013-06-10 20:55:04.000000000 +0200 @@ -10,7 +10,7 @@ <book id="ksirk" lang="&language;"> <bookinfo> -<title>The &kappname; Handbook</title> +<title>The &ksirk; Handbook</title> <authorgroup> <author> @@ -21,14 +21,26 @@ <address><email>kl...@free.fr</email></address> </affiliation> </author> +<author> +<firstname>Nemanja</firstname> +<othername></othername> +<surname>Hirsl</surname> +<affiliation> +<address><email>nemhi...@gmail.com</email></address> +</affiliation> +</author> <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> <copyright> -<year>2002-2008</year> +<year>2002-2012</year> <holder>Gael de Chalendar</holder> </copyright> +<copyright> +<year>2013</year> +<holder>Nemanja Hirsl</holder> +</copyright> <!-- Translators: put here the copyright notice of the translation --> <!-- Put here the FDL notice. Read the explanation in fdl-notice.docbook and in the FDL itself on how to use it. --> @@ -41,24 +53,24 @@ (V.MM.LL), it could be used by automation scripts. Do NOT change these in the translation. --> -<date>18/09/2008</date> -<releaseinfo>4.1.2</releaseinfo> +<date>2013-02-17</date> +<releaseinfo>4.10.0</releaseinfo> <!-- Abstract about this handbook --> <abstract> <para> -&kappname; is a computerized version of a well known strategy game. Commercial +&ksirk; is a computerized version of a well known strategy game. Commercial and other Free Software versions exist but I (Gaël de Chalendar) created this game initially as a C++ learning exercise and so, I developed it up to this point (see README for details). </para> <para> -In the current version, &kappname; is a multi-player network-enabled game with an AI. +In the current version, &ksirk; is a multi-player network-enabled game with an AI. (see TODO for details) </para> <para> This documentation gives the major information you need to start playing. -Please read the tooltips and the status bar messages to complete your information. A chapter explains how to create new skins for &kappname; +Please read the tooltips and the status bar messages to complete your information. A chapter explains how to create new skins for &ksirk; </para> <para> The goal of the game is simply to conquer the World... It is done by attacking your neighbors @@ -101,13 +113,13 @@ problems. Basically a long version of the abstract. Don't include a revision history. (see installation appendix comment) --> <para> -&kappname; is a computerized version of a well known strategy game. Commercial +&ksirk; is a computerized version of a well known strategy game. Commercial and other Free Software versions exist but I (Gaël de Chalendar) created this game initially as a C++ learning exercise and so, I developed it up to this point (see README for details). </para> <para> <screenshot> - <screeninfo>Here's a screenshot of &kappname;</screeninfo> + <screeninfo>Here's a screenshot of &ksirk;</screeninfo> <mediaobject> <imageobject> <imagedata fileref="firing-screenshot.png" format="PNG"/> @@ -119,7 +131,7 @@ </screenshot> </para> <para> -In the current version, &kappname; is a multi-player network-enabled game with an AI. +In the current version, &ksirk; is a multi-player network-enabled game with an AI. (see TODO for details) </para> <para> @@ -133,7 +145,7 @@ </chapter> <chapter id="using-kapp"> -<title>Using &kappname;</title> +<title>Using &ksirk;</title> <!-- This chapter should tell the user how to use your app. You should use as many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document @@ -142,7 +154,7 @@ <sect1 id="playing-ksirk"> -<title>Playing &kappname;</title> +<title>Playing &ksirk;</title> <para>Preliminary note : the map can be scrolled by three methods:</para> <itemizedlist><listitem><para>You can put your mouse near a border of the window and the map will scroll in that direction</para></listitem> @@ -152,9 +164,9 @@ <sect2 id="mainmenu" > <title>Starting a game</title> <para> -When &kappname; starts, you are presented with a main menu. +When &ksirk; starts, you are presented with a main menu. <screenshot> - <screeninfo>The main menu of &kappname;</screeninfo> + <screeninfo>The main menu of &ksirk;</screeninfo> <mediaobject> <imageobject> <imagedata fileref="introscreen.png" format="PNG"/> @@ -169,7 +181,7 @@ <varlistentry> <term> <menuchoice> - <guimenu>New Game</guimenu> + <guimenu>New Local Game</guimenu> </menuchoice> </term> <listitem> @@ -179,16 +191,40 @@ </listitem> </varlistentry> <varlistentry> - <term> - <menuchoice> - <guimenu>Join</guimenu> - </menuchoice> - </term> - <listitem> - <para> - <action>Allow to join a network game as a client</action> - </para> - </listitem> +<term> + <menuchoice> + <guimenu>Play &ksirk; over Jabber Network</guimenu> + </menuchoice> +</term> +<listitem> + <para> + <action>Play &ksirk; over <ulink url="http://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol";>Jabber</ulink>. You need to register Jabber account first.</action> + </para> +</listitem> +</varlistentry> +<varlistentry> +<term> + <menuchoice> + <guimenu>New Standard TCP/IP Network Game</guimenu> + </menuchoice> +</term> +<listitem> + <para> + <action>Start a new game using <ulink url="http://en.wikipedia.org/wiki/Internet_protocol_suite";>Internet protocol suite</ulink>.</action> + </para> +</listitem> +</varlistentry> +<varlistentry> +<term> + <menuchoice> + <guimenu>Join Standard TCP/IP Network Game</guimenu> + </menuchoice> +</term> +<listitem> + <para> + <action>Join to the created by other user game using <ulink url="http://en.wikipedia.org/wiki/Internet_protocol_suite";>Internet protocol suite</ulink>.</action> + </para> +</listitem> </varlistentry> <varlistentry> <term> @@ -210,14 +246,14 @@ </term> <listitem> <para> - <action>Maybe you finally don't want to play ?</action> + <action>Maybe you finally don't want to play?</action> </para> </listitem> </varlistentry> </variablelist> </para> <para> -If you hit <guibutton>New Game</guibutton> you will be presented with the <guilabel>New game properties</guilabel> dialog where you will be able to choose the number of players, the skin (or theme) to use, the game type (conquer the goal or have a specific goal) and finally if this game will be played with online players or if it is purely local. + If you hit <guibutton>New Local Game</guibutton> you will be presented with the <guilabel>New game properties</guilabel> dialog where you will be able to choose the number of players, the skin (or theme) to use, the game type (conquer the goal or have a specific goal) and finally if this game will be played with online players or if it is purely local. New skins can be downloaded using <guibutton>Download New Skins</guibutton> button. <screenshot> <screeninfo>The New Game dialog</screeninfo> <mediaobject> @@ -231,7 +267,7 @@ </screenshot> </para> <para> -To start a network game, check the <guilabel>Network game</guilabel> check box on the right of the number of players spin box. After clicking <guibutton>OK</guibutton>, you will be able to choose the network parameters: number of network players and TCP port on which waiting for connections. +To start a TCP/IP network game, choose the <guilabel>New Standard TCP/IP Network Game</guilabel> option on introduction screen. After clicking this button you will be able to choose the network parameters: number of local players and TCP port on which waiting for connections. <screenshot> <screeninfo>Network game parameters dialog</screeninfo> <mediaobject> @@ -245,7 +281,7 @@ </screenshot> </para> <para> -Then, network players will be able to connect by choosing <guilabel>Join</guilabel> on the introduction screen and by indicating the IP or hostname of the host and the port number you just set. +Then, network players will be able to connect by choosing <guilabel>Join Standard TCP/IP Network Game</guilabel> on the introduction screen and by indicating the IP or hostname of the host and the port number you just set. <screenshot> <screeninfo>Joining network game dialog</screeninfo> <mediaobject> @@ -259,22 +295,22 @@ </screenshot> </para> <para> -Each connection is indicated by the message below in the status bar. + Each connection is indicated by a new row in the <guilabel>Players</guilabel> table below the map thumbnail. <screenshot> - <screeninfo>Connection message</screeninfo> + <screeninfo>New player row</screeninfo> <mediaobject> <imageobject> <imagedata fileref="justjoined.png" format="PNG"/> </imageobject> <textobject> - <phrase>Connection message</phrase> + <phrase>New player row</phrase> </textobject> </mediaobject> </screenshot> </para> <para> -Let's suppose you keep all the default settings and hit <guibutton>OK</guibutton>. You will then setup two players, one after one. For each one, you'll choose a name, a nationality and, if you want, setup a password such that nobody else than you can reuse this player when reloading this saved game. Lastly, you will here specify if this player is played by the computer or by a human being. +Let's suppose you keep all the default settings and hit <guibutton>Next</guibutton>. You will then setup two players, one after one. For each one, you'll choose a name, a nationality and, if you want, setup a password such that nobody else than you can reuse this player when reloading this saved game. Lastly, you will here specify if this player is played by the computer or by a human being. <screenshot> <screeninfo>The Player Setup dialog</screeninfo> <mediaobject> @@ -288,26 +324,26 @@ </screenshot> </para> <para> -Then, if you choose to play with goal, the goal of each local player is displayed, preceded by a warning such that other players looking at the same computer can discreetly turn away while the goal is being viewed. + Then, after clicking <guibutton>Start</guibutton>, if you choose to play with goal, the goal of each local player is displayed, preceded by a warning such that other players looking at the same computer can discreetly turn away while the goal is being viewed. <screenshot> - <screeninfo>The Goal Display dialog</screeninfo> + <screeninfo>The Goal Display warning message</screeninfo> <mediaobject> <imageobject> - <imagedata fileref="displaygoalmessage.png" format="PNG"/> + <imagedata fileref="displaygoalwarningmessage.png" format="PNG"/> </imageobject> <textobject> - <phrase>The Goal Display dialog</phrase> + <phrase>The Goal Display warning message</phrase> </textobject> </mediaobject> </screenshot> <screenshot> - <screeninfo>The Goal Display warning message</screeninfo> + <screeninfo>The Goal Display dialog</screeninfo> <mediaobject> <imageobject> - <imagedata fileref="displaygoalwarningmessage.png" format="PNG"/> + <imagedata fileref="displaygoalmessage.png" format="PNG"/> </imageobject> <textobject> - <phrase>The Goal Display warning message</phrase> + <phrase>The Goal Display dialog</phrase> </textobject> </mediaobject> </screenshot> @@ -577,6 +613,7 @@ have placed their armies, they can start a new redistribution cycle or start a new turn... </para> </sect2> +<!-- Does not work for current TCP/IP games <sect2 id="sending-messages" > <title>Sending messages to other players</title> <para> @@ -595,6 +632,7 @@ </para> </sect2> +--> </sect1> </chapter> @@ -602,7 +640,7 @@ <title>Command Reference</title> <sect1 id="kapp-mainwindow"> -<title>The main &kappname; window</title> +<title>The main &ksirk; window</title> <sect2> <title>The buttons</title> <para> @@ -648,7 +686,7 @@ </chapter> <chapter id="developers"> - <title>Developer's Guide to &kappname;</title> + <title>Developer's Guide to &ksirk;</title> <para> Please refer to <ulink url="http://api.kde.org/";>http://api.kde.org/</ulink> for the documentation of the API. It was quite complete but is currently a little bit outdated. There are no comments in the <filename>.cpp</filename> implementation files. @@ -664,7 +702,7 @@ <chapter id="skins"> <title>Creating new skins</title> <para> - &kappname; comes with a skin editor, named ksirkskineditor(!), that allows to edit all skin data, as soon as graphics (map, sprites, etc.) are available in a SVG file. Please see the ksirkskineditor manual for further details. + &ksirk; comes with a skin editor, named ksirkskineditor(!), that allows to edit all skin data, as soon as graphics (map, sprites, &etc;) are available in a SVG file. Please see the ksirkskineditor manual for further details. </para> </chapter> @@ -697,10 +735,13 @@ <title>Credits and License</title> <para> -&kappname; +&ksirk; +</para> +<para> +Program copyright 2002-2012 Gael de Chalendar <email>kl...@free.fr</email> </para> <para> -Program copyright 2002-2008 Gael de Chalendar <email>kl...@free.fr</email> +Program copyright 2013 Nemanja Hirsl <email>nemhi...@gmail.com</email> </para> <para> Contributors: @@ -732,7 +773,7 @@ <title>Installation</title> <sect1 id="getting-ksirk"> -<title>How to obtain &kappname;</title> +<title>How to obtain &ksirk;</title> &install.intro.documentation; </sect1> Files old/ksirk-4.10.4/doc/introscreen.png and new/ksirk-4.10.90/doc/introscreen.png differ Files old/ksirk-4.10.4/doc/invasionslider.png and new/ksirk-4.10.90/doc/invasionslider.png differ Files old/ksirk-4.10.4/doc/joinnetgame.png and new/ksirk-4.10.90/doc/joinnetgame.png differ Files old/ksirk-4.10.4/doc/joueurSuivant.png and new/ksirk-4.10.90/doc/joueurSuivant.png differ Files old/ksirk-4.10.4/doc/justjoined.png and new/ksirk-4.10.90/doc/justjoined.png differ Files old/ksirk-4.10.4/doc/ksirkskineditor/index.cache.bz2 and new/ksirk-4.10.90/doc/ksirkskineditor/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/doc/ksirkskineditor/index.docbook new/ksirk-4.10.90/doc/ksirkskineditor/index.docbook --- old/ksirk-4.10.4/doc/ksirkskineditor/index.docbook 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/doc/ksirkskineditor/index.docbook 2013-06-10 20:55:04.000000000 +0200 @@ -357,7 +357,7 @@ </mediaobject> </para> <para> - The blue component (in RGB model) of a country's color identifies the country: index 0 is country 0 in the onu.xml file, index 1 is country 1, &etc;. White (0xFFFFFF in RGB) identifies the absence of country (sees or, why not, no man's lands). + The blue component (in RGB model) of a country's color identifies the country: index 0 is country 0 in the onu.xml file, index 1 is country 1, &etc; White (0xFFFFFF in RGB) identifies the absence of country (sees or, why not, no man's lands). </para> </sect3> <sect3> Files old/ksirk-4.10.4/doc/messagesent.png and new/ksirk-4.10.90/doc/messagesent.png differ Files old/ksirk-4.10.4/doc/moveArmies.png and new/ksirk-4.10.90/doc/moveArmies.png differ Files old/ksirk-4.10.4/doc/newGame.png and new/ksirk-4.10.90/doc/newGame.png differ Files old/ksirk-4.10.4/doc/newgamedialog.png and new/ksirk-4.10.90/doc/newgamedialog.png differ Files old/ksirk-4.10.4/doc/numnetplayersdialog.png and new/ksirk-4.10.90/doc/numnetplayersdialog.png differ Files old/ksirk-4.10.4/doc/placingarmies.png and new/ksirk-4.10.90/doc/placingarmies.png differ Files old/ksirk-4.10.4/doc/playersetupdialog.png and new/ksirk-4.10.90/doc/playersetupdialog.png differ Files old/ksirk-4.10.4/doc/preferences.png and new/ksirk-4.10.90/doc/preferences.png differ Files old/ksirk-4.10.4/doc/quit.png and new/ksirk-4.10.90/doc/quit.png differ Files old/ksirk-4.10.4/doc/recycling.png and new/ksirk-4.10.90/doc/recycling.png differ Files old/ksirk-4.10.4/doc/recyclingFinished.png and new/ksirk-4.10.90/doc/recyclingFinished.png differ Files old/ksirk-4.10.4/doc/shownumberofarmies.png and new/ksirk-4.10.90/doc/shownumberofarmies.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/Dialogs/InvasionSlider.cpp new/ksirk-4.10.90/ksirk/Dialogs/InvasionSlider.cpp --- old/ksirk-4.10.4/ksirk/Dialogs/InvasionSlider.cpp 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/Dialogs/InvasionSlider.cpp 2013-06-10 20:55:04.000000000 +0200 @@ -83,10 +83,6 @@ #include <KDialog> #include <KAboutData> -#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API -#include <libkdegamesprivate/kchatdialog.h> -#include <libkdegamesprivate/kgame/kgamechat.h> - #include <sys/utsname.h> #include <QLabel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/GameLogic/gameautomaton.h new/ksirk-4.10.90/ksirk/GameLogic/gameautomaton.h --- old/ksirk-4.10.4/ksirk/GameLogic/gameautomaton.h 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/GameLogic/gameautomaton.h 2013-06-10 20:55:04.000000000 +0200 @@ -25,7 +25,7 @@ #include <libkdegamesprivate/kgame/kgame.h> #include <libkdegamesprivate/kgame/kplayer.h> #include <libkdegamesprivate/kgame/kgameio.h> -#include <libkdegamesprivate/kgame/kgamepropertyarray.h> +#include <libkdegamesprivate/kgame/kgamemessage.h> #include <libkdegamesprivate/kgame/kgameproperty.h> #include <libkdegamesprivate/kgame/kmessageio.h> #include <libkdegamesprivate/kgamesvgdocument.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/GameLogic/player.h new/ksirk-4.10.90/ksirk/GameLogic/player.h --- old/ksirk-4.10.4/ksirk/GameLogic/player.h 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/GameLogic/player.h 2013-06-10 20:55:04.000000000 +0200 @@ -33,6 +33,7 @@ #include <libkdegamesprivate/kgame/kplayer.h> #include <libkdegamesprivate/kgame/kgame.h> #include <libkdegamesprivate/kgame/kgameproperty.h> +#include <libkdegamesprivate/kgame/kgamepropertyhandler.h> #include <QString> #include <QMutex> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/iris/src/CMakeLists.txt new/ksirk-4.10.90/ksirk/iris/src/CMakeLists.txt --- old/ksirk-4.10.4/ksirk/iris/src/CMakeLists.txt 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/iris/src/CMakeLists.txt 2013-06-25 20:37:44.000000000 +0200 @@ -75,6 +75,9 @@ set(libiris_SRCS ${libiris_SRCS} irisnet/corelib/netinterface_win.cpp ) + if(MINGW) + add_definitions(-DWIN32) + endif(MINGW) endif(WIN32) include_directories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/iris/src/jdns/jdns_p.h new/ksirk-4.10.90/ksirk/iris/src/jdns/jdns_p.h --- old/ksirk-4.10.4/ksirk/iris/src/jdns/jdns_p.h 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/iris/src/jdns/jdns_p.h 2013-06-25 20:37:44.000000000 +0200 @@ -40,6 +40,8 @@ # define JDNS_OS_FREEBSD #elif defined(__NetBSD__) # define JDNS_OS_NETBSD +#elif defined(__OpenBSD__) +# define JDNS_OS_OPENBSD #elif defined(sun) || defined(__sun) # define JDNS_OS_SOLARIS #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/iris/src/jdns/jdns_sys.c new/ksirk-4.10.90/ksirk/iris/src/jdns/jdns_sys.c --- old/ksirk-4.10.4/ksirk/iris/src/jdns/jdns_sys.c 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/iris/src/jdns/jdns_sys.c 2013-06-25 20:37:44.000000000 +0200 @@ -702,7 +702,7 @@ #endif #if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \ -defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS) +defined(JDNS_OS_NETBSD) || defined(JDNS_OS_OPENBSD) || defined (JDNS_OS_SOLARIS) # define USE_EXTEXT #endif @@ -721,6 +721,12 @@ #define RESVAR _res #endif +#ifdef JDNS_OS_OPENBSD +#define RESVAREXT _res_ext +#else +#define RESVAREXT RESVAR._u._ext +#endif + params = jdns_dnsparams_new(); /* error initializing? */ @@ -728,15 +734,21 @@ return params; /* nameservers - ipv6 */ - for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n) +#ifdef JDNS_OS_OPENBSD + for(n = 0; n < MAXNS; ++n) +#else + for(n = 0; n < MAXNS && n < RESVAREXT.nscount; ++n) +#endif { jdns_address_t *addr; struct sockaddr_in6 *sa6; -#ifdef USE_EXTEXT - sa6 = ((struct sockaddr_in6 *)RESVAR._u._ext.ext) + n; +#if defined(USE_EXTEXT) && !defined(JDNS_OS_OPENBSD) + sa6 = ((struct sockaddr_in6 *)RESVAREXT.ext) + n; +#elif defined(JDNS_OS_OPENBSD) + sa6 = &RESVAREXT.nsaddr_list[n]; #else - sa6 = RESVAR._u._ext.nsaddrs[n]; + sa6 = RESVAREXT.nsaddrs[n]; #endif if(sa6 == NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/iris/src/xmpp/zlib/zlibcompressor.cpp new/ksirk-4.10.90/ksirk/iris/src/xmpp/zlib/zlibcompressor.cpp --- old/ksirk-4.10.4/ksirk/iris/src/xmpp/zlib/zlibcompressor.cpp 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/iris/src/xmpp/zlib/zlibcompressor.cpp 2013-06-25 20:37:44.000000000 +0200 @@ -33,7 +33,7 @@ write(QByteArray(),true); int result = deflateEnd(zlib_stream_); if (result != Z_OK) - qWarning("compressor.c: deflateEnd failed (%s)", result); + qWarning("compressor.c: deflateEnd failed (%d)", result); flushed_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/kgamewin.cpp new/ksirk-4.10.90/ksirk/kgamewin.cpp --- old/ksirk-4.10.4/ksirk/kgamewin.cpp 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/kgamewin.cpp 2013-06-10 20:55:04.000000000 +0200 @@ -85,7 +85,6 @@ #include <KAboutData> #define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API -#include <libkdegamesprivate/kchatdialog.h> #include <libkdegamesprivate/kgame/kgamechat.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/kgamewin.h new/ksirk-4.10.90/ksirk/kgamewin.h --- old/ksirk-4.10.4/ksirk/kgamewin.h 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/kgamewin.h 2013-06-10 20:55:04.000000000 +0200 @@ -50,9 +50,6 @@ #include <KXmlGuiWindow> #include <KStandardDirs> #include <KShortcut> -// include files for kde games -#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API -#include <libkdegamesprivate/kgame/kgamechat.h> // #include <kdialogbase.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirk/ksirk.desktop new/ksirk-4.10.90/ksirk/ksirk.desktop --- old/ksirk-4.10.4/ksirk/ksirk.desktop 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirk/ksirk.desktop 2013-06-10 20:55:04.000000000 +0200 @@ -1,7 +1,7 @@ # KDE Config File [Desktop Entry] Type=Application -Exec=ksirk -caption "%c" %i +Exec=ksirk -caption %c %i Icon=ksirk X-DocPath=ksirk/index.html Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirkskineditor/CMakeLists.txt new/ksirk-4.10.90/ksirkskineditor/CMakeLists.txt --- old/ksirk-4.10.4/ksirkskineditor/CMakeLists.txt 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirkskineditor/CMakeLists.txt 2013-06-25 20:37:44.000000000 +0200 @@ -41,7 +41,7 @@ kde4_add_kcfg_files( ksirkskineditor_SRCS ksirkskineditorsettings.kcfgc ) -kde4_add_app_icon(ksirkskineditor_SRCS "hi*-app-ksirkskineditor.png") +kde4_add_app_icon(ksirkskineditor_SRCS "hi*-app-ksirk.png") kde4_add_executable(ksirkskineditor ${ksirkskineditor_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.4/ksirkskineditor/ksirkskineditor.desktop new/ksirk-4.10.90/ksirkskineditor/ksirkskineditor.desktop --- old/ksirk-4.10.4/ksirkskineditor/ksirkskineditor.desktop 2013-05-28 21:50:32.000000000 +0200 +++ new/ksirk-4.10.90/ksirkskineditor/ksirkskineditor.desktop 2013-06-10 20:55:04.000000000 +0200 @@ -1,7 +1,7 @@ # KDE Config File [Desktop Entry] Type=Application -Exec=ksirkskineditor -caption "%c" %i +Exec=ksirkskineditor -caption %c %i Icon=preferences-desktop-locale X-DocPath=ksirkskineditor/index.html Terminal=false -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
