Re: KDiff3 1.8 release.
Hi, > I uploaded an untagged 1.7.90 version to Debian so it could still make it > in the next Debian release buster (which is supposed to get rid of QT4). > => https://packages.debian.org/buster/kdiff3 ;) > > > Eike is the Debian packaging managed in a repo somewhere? Are you > > > interested in making it part of the KDE Qt Debian team? > > KDiff3 Debian packaging is managed all old-fashioned on my local PC > (for over 15 years now...). :) maybe time to update the packaging. Feel free to ask the teams list (debian- qt-...@lists.debian.org) for help. > I didn't yet engage in team packaging... I'm active in the Qt/KDE Maintainers team and I think kdiff3 is a perfect candidate for the team maybe wanna join? regards hefee
Re: KDiff3 1.8 release.
On Sat, Mar 16, 2019, 1:14 PM Jonathan Riddell wrote: > Looks good from a quick compile and run. > > I take it you have no access to the obsolete sourceforge webpage? > > I see Debian has a 1.7 release, where is that available? > If it's truly 1.7 its based off a partial kf5 port that was never released. Don't remember off hand who created. 1.7.90 would be an older version of my code not officially released. > > Do you have any access to update > https://www.linux-apps.com/content/show.php?content=9807 ? > No. > > I'm adding this to KDE neon dev unstable edition. > > Eike is the Debian packaging managed in a repo somewhere? Are you > interested in making it part of the KDE Qt Debian team? > Yes. > Jonathan > > > > On Sat, 16 Mar 2019 at 14:11, Michael Reeves wrote: > > > > Fixed now. > > > > On Thu, Mar 14, 2019, 4:31 AM Wolfgang Bauer wrote: > >> > >> The latest change > >> ( > https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1 > ) > >> unfortunately breaks the build here: > >> > >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > >> CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function > >> `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': > >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined > >> reference to `kdeMain()' > >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined > >> reference to `kdeMain()' > >> ... > >> and so on. > >> > >> Kind Regards, > >> Wolfgang > >> >
Re: KDiff3 1.8 release.
Hi! Am Samstag, 16. März 2019, 17:19:17 CET schrieben Sie: > On Sat, Mar 16, 2019, 1:14 PM Jonathan Riddell wrote: > > I see Debian has a 1.7 release, where is that available? > > If it's truly 1.7 its based off a partial kf5 port that was never released. > Don't remember off hand who created. 1.7.90 would be an older version of my > code not officially released. I uploaded an untagged 1.7.90 version to Debian so it could still make it in the next Debian release buster (which is supposed to get rid of QT4). => https://packages.debian.org/buster/kdiff3 > > Eike is the Debian packaging managed in a repo somewhere? Are you > > interested in making it part of the KDE Qt Debian team? KDiff3 Debian packaging is managed all old-fashioned on my local PC (for over 15 years now...). :) I didn't yet engage in team packaging... Ciao, Eike signature.asc Description: This is a digitally signed message part.
Re: KDiff3 1.8 release.
El dissabte, 16 de març de 2019, a les 18:13:49 CET, Jonathan Riddell va escriure: > Looks good from a quick compile and run. > > I take it you have no access to the obsolete sourceforge webpage? I think this should really be our first priority, trying to either update or take down that page. Cheers, Albert > > I see Debian has a 1.7 release, where is that available? > > Do you have any access to update > https://www.linux-apps.com/content/show.php?content=9807 ? > > I'm adding this to KDE neon dev unstable edition. > > Eike is the Debian packaging managed in a repo somewhere? Are you > interested in making it part of the KDE Qt Debian team? > > Jonathan > > > > On Sat, 16 Mar 2019 at 14:11, Michael Reeves wrote: > > > > Fixed now. > > > > On Thu, Mar 14, 2019, 4:31 AM Wolfgang Bauer wrote: > >> > >> The latest change > >> (https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1) > >> unfortunately breaks the build here: > >> > >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > >> CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function > >> `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': > >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined > >> reference to `kdeMain()' > >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined > >> reference to `kdeMain()' > >> ... > >> and so on. > >> > >> Kind Regards, > >> Wolfgang > >> >
Re: KDiff3 1.8 release.
Groovy got it added to Neon dev unstable edition https://build.neon.kde.org/job/bionic_unstable_forks_kdiff3/ I fixed the kcrash loading with it Jonathan On Sat, 16 Mar 2019 at 21:19, Michael Reeves wrote: > > > > On Sat, Mar 16, 2019, 1:14 PM Jonathan Riddell wrote: >> >> Looks good from a quick compile and run. >> >> I take it you have no access to the obsolete sourceforge webpage? >> >> I see Debian has a 1.7 release, where is that available? > > If it's truly 1.7 its based off a partial kf5 port that was never released. > Don't remember off hand who created. 1.7.90 would be an older version of my > code not officially released. >> >> >> Do you have any access to update >> https://www.linux-apps.com/content/show.php?content=9807 ? > > > No. > >> >> >> I'm adding this to KDE neon dev unstable edition. >> >> Eike is the Debian packaging managed in a repo somewhere? Are you >> interested in making it part of the KDE Qt Debian team? > > > Yes. > >> >> Jonathan >> >> >> >> On Sat, 16 Mar 2019 at 14:11, Michael Reeves wrote: >> > >> > Fixed now. >> > >> > On Thu, Mar 14, 2019, 4:31 AM Wolfgang Bauer wrote: >> >> >> >> The latest change >> >> (https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1) >> >> unfortunately breaks the build here: >> >> >> >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: >> >> CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function >> >> `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': >> >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined >> >> reference to `kdeMain()' >> >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: >> >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined >> >> reference to `kdeMain()' >> >> ... >> >> and so on. >> >> >> >> Kind Regards, >> >> Wolfgang >> >>
Re: KDiff3 1.8 release.
Looks good from a quick compile and run. I take it you have no access to the obsolete sourceforge webpage? I see Debian has a 1.7 release, where is that available? Do you have any access to update https://www.linux-apps.com/content/show.php?content=9807 ? I'm adding this to KDE neon dev unstable edition. Eike is the Debian packaging managed in a repo somewhere? Are you interested in making it part of the KDE Qt Debian team? Jonathan On Sat, 16 Mar 2019 at 14:11, Michael Reeves wrote: > > Fixed now. > > On Thu, Mar 14, 2019, 4:31 AM Wolfgang Bauer wrote: >> >> The latest change >> (https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1) >> unfortunately breaks the build here: >> >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: >> CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function >> `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined >> reference to `kdeMain()' >> /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: >> /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined >> reference to `kdeMain()' >> ... >> and so on. >> >> Kind Regards, >> Wolfgang >>
Re: KDiff3 1.8 release.
Fixed now. On Thu, Mar 14, 2019, 4:31 AM Wolfgang Bauer wrote: > The latest change > ( > https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1) > > unfortunately breaks the build here: > > /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function > `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': > /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined > reference to `kdeMain()' > /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: > /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined > reference to `kdeMain()' > ... > and so on. > > Kind Regards, > Wolfgang > >
Re: KDiff3 1.8 release.
The latest change (https://cgit.kde.org/kdiff3.git/commit/?id=638bd5a02893dde4a1927abd0c8a611b3b3ab6a1) unfortunately breaks the build here: /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: CMakeFiles/kdiff3part.dir/pdiff.cpp.o: in function `debugLineCheck(Diff3LineList&, int, e_SrcSelector)': /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:82: undefined reference to `kdeMain()' /usr/lib/gcc/i586-suse-linux/8/../../../../i586-suse-linux/bin/ld: /home/abuild/rpmbuild/BUILD/kdiff3-1.7.95git/src/pdiff.cpp:96: undefined reference to `kdeMain()' ... and so on. Kind Regards, Wolfgang
Re: KDiff3 1.8 release.
On Sun, Mar 10, 2019, 7:36 PM Friedrich W. H. Kossebau wrote: > Hi Michael, > > Am Samstag, 9. März 2019, 16:53:58 CET schrieb Michael Reeves: > >I would like to move forward with a 1.8 release targeting end of > Apirl. > > Could someone please check over the kf5/qt5 changes to make sure there > are > > no major problems? Also there is custom painter that tries to handle left > > to right text manually what is the proper way to support this? I will be > > doing at least the next few releases independent of Applications do to > the > > amount time past since the last release for kdiff3. The 1.8 branch > creation > > and freeze is set for 3-22 if no major issues are found. > > When I gave it a (quick) look earlier today, nothing grave catched my eyes > when it comes to Qt5/kF5 interfacing code (just a few favourite nitpicks > of > mine, which are already reviewed/pushed :) ). > No idea about the custom RL painter myself or proper ways. > > Two things I noticed though which you ideally give some look: > > kdiff3 -h & -v show both a window as well as print output on the > commandline. > The windows are a bit unexpected and unusual given one already is on the > commandline, perhaps that feature to also show a window could be removed? > isatty looks like it should be able to tell when the output is going to the terminal and disable the windows in that case. Not sure about if it's going to a file. I look into this a little more. > You might also want to port the debug output from fprintf(stderr, ...) & > Co. > to qCDebug() & Co. > Definitely will do. I don't really like the direct system call use where a qt equivalent exists. Qt also provide s configure this easily without a rebuild. > > Cheers > Friedrich > > >
Re: KDiff3 1.8 release.
Hi Michael, Am Samstag, 9. März 2019, 16:53:58 CET schrieb Michael Reeves: >I would like to move forward with a 1.8 release targeting end of Apirl. > Could someone please check over the kf5/qt5 changes to make sure there are > no major problems? Also there is custom painter that tries to handle left > to right text manually what is the proper way to support this? I will be > doing at least the next few releases independent of Applications do to the > amount time past since the last release for kdiff3. The 1.8 branch creation > and freeze is set for 3-22 if no major issues are found. When I gave it a (quick) look earlier today, nothing grave catched my eyes when it comes to Qt5/kF5 interfacing code (just a few favourite nitpicks of mine, which are already reviewed/pushed :) ). No idea about the custom RL painter myself or proper ways. Two things I noticed though which you ideally give some look: kdiff3 -h & -v show both a window as well as print output on the commandline. The windows are a bit unexpected and unusual given one already is on the commandline, perhaps that feature to also show a window could be removed? You might also want to port the debug output from fprintf(stderr, ...) & Co. to qCDebug() & Co. Cheers Friedrich
KDiff3 1.8 release.
I would like to move forward with a 1.8 release targeting end of Apirl. Could someone please check over the kf5/qt5 changes to make sure there are no major problems? Also there is custom painter that tries to handle left to right text manually what is the proper way to support this? I will be doing at least the next few releases independent of Applications do to the amount time past since the last release for kdiff3. The 1.8 branch creation and freeze is set for 3-22 if no major issues are found.
