| Summary: | kasablanca packaging request | ||
|---|---|---|---|
| Product: | TDE | Reporter: | Julius Schwartzenberg <julius.schwartzenberg> |
| Component: | non-core programs | Assignee: | Francois Andriot <albator78> |
| Status: | RESOLVED FIXED | ||
| Severity: | needs packaging | CC: | albator78, bugwatch, kb9vqf, slavek.banko |
| Priority: | P5 | ||
| Version: | R14.0.0 [Trinity] | ||
| Hardware: | All | ||
| OS: | All | ||
| Compiler Version: | TDE Version String: | ||
| Application Version: | Application Name: | ||
|
Description
Julius Schwartzenberg
2011-10-30 07:39:33 CDT
Built and working in R14 / TQT3. # Original tarball: http://kasablanca.berlios.de/ kasablanca-0.4.0.2.tar.gz # Patches: http://git.trinitydesktop.org/cgit/tde-packaging/tree/redhat/extras/kasablanca/kasablanca-0.4.0.2-dt.patch http://git.trinitydesktop.org/cgit/tde-packaging/tree/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch http://git.trinitydesktop.org/cgit/tde-packaging/tree/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch Then run: # Extract upstream package cd ~/src rm -rf kasablanca-0.4.0.2 tar xfz kasablanca-0.4.0.2.tar.gz cd kasablanca-0.4.0.2 # Patch patch -p1 < kasablanca-0.4.0.2-dt.patch patch -p1 < kasablanca-0.4.0.2-fix_autotools_detection.patch patch -p1 < kasablanca-0.4.0.2-missing_ldflags.patch # Remove KDE3 stuff rm -rf admin # Convert QT3 to TQT3 ~/tde/tde_r14/experimental/qt3-tqt3/convert_existing_qt3_app_to_tqt3 # Convert KDE3 to TDE find ./ -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.ui" -o -name "*.kcfg" \) -print0 |\ xargs -r0 sed -i \ -e "s|kcmdlineargs.h|tdecmdlineargs.h|g" \ -e "s|kapplication.h|tdeapplication.h|g" \ -e "s|kaboutdata.h|tdeaboutdata.h|g" \ -e "s|khtml_part.h|tdehtml_part.h|g" \ -e "s|khtmlview.h|tdehtmlview.h|g" \ -e "s|kdeversion.h|tdeversion.h|g" \ -e "s|kmenubar.h|tdemenubar.h|g" \ -e "s|klocale.h|tdelocale.h|g" \ -e "s|kfiledialog.h|tdefiledialog.h|g" \ -e "s|kconfigdialog.h|tdeconfigdialog.h|g" \ -e "s|klistview.h|tdelistview.h|g" \ -e "s|kwin.h|twin.h|g" \ -e "s|kconfig.h|tdeconfig.h|g" \ -e "s|kaction.h|tdeaction.h|g" \ -e "s|kpopupmenu.h|tdepopupmenu.h|g" \ -e "s|kglobal.h|tdeglobal.h|g" \ -e "s|kglobalsettings.h|tdeglobalsettings.h|g" \ -e "s|kmessagebox.h|tdemessagebox.h|g" \ -e "s|kmainwindow.h|tdemainwindow.h|g" \ -e "s|KConfig|TDEConfig|g" \ -e "s|kaboutapplication.h|tdeaboutapplication.h|g" \ -e "s|KPopupMenu|TDEPopupMenu|g" \ -e "s|KProcess|TDEProcess|g" \ -e "s|KCmdLineOptions|TDECmdLineOptions|g" \ -e "s|KCmdLineArgs|TDECmdLineArgs|g" \ -e "s|KCmdLineLastOption|TDECmdLineLastOption|g" \ -e "s|KAboutData|TDEAboutData|g" \ -e "s|KMainWindow|TDEMainWindow|g" \ -e "s|KGlobal|TDEGlobal|g" \ -e "s|KAboutApplication|TDEAboutApplication|g" \ -e "s|KIcon|TDEIcon|g" \ -e "s|KLocale|TDELocale|g" \ -e "s|KListView|TDEListView|g" \ -e "s|KAction|TDEAction|g" \ -e "s|KFontRequester|TDEFontRequester|g" \ -e "s|KToggleAction|TDEToggleAction|g" \ -e "s|NEKWinInfo|NETWinInfo|g" \ -e "s|KApplication|TDEApplication|g" \ -e "s|KCompletion|TDECompletion|g" \ -e "s|KHTMLPart|TDEHTMLPart|g" \ -e "s|kio/|tdeio/|g" \ -e "s|QFont(|TQFont(|g" \ -e "s|KStandardDirs|TDEStandardDirs|g" find ./ -type f \( -name "*.am" \) -print0 |\ xargs -r0 sed -i \ -e "s|KDE_|TDE_|g" \ -e "s|^TDE_DOCS|KDE_DOCS|g" \ -e "s|^TDE_LANG|KDE_LANG|g" \ -e "s|^TDE_ICON|KDE_ICON|g" \ -e "s|_KDE|_TDE|g" \ -e "s|_KHTML|_TDEHTML|g" \ -e "s|_QT|_TQT|g" \ -e "s|-lkde|-ltde|g" # Now, the sources are ready ! # Generates makefiles ... cp -rf ~/tde/tde_r14/main/common/admin/ . cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" make -f "admin/Makefile.common" # And build ... unset QTDIR QTINC QTLIB export PATH="/opt/trinity/bin:/usr/lib64/ccache:/usr/bin:/bin" export LDFLAGS="-L/opt/trinity/lib64 -I/opt/trinity/include" ./configure \ --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu --target=x86_64-redhat-linux-gnu \ --prefix=/opt/trinity \ --exec-prefix=/opt/trinity \ --disable-dependency-tracking \ --disable-rpath \ --bindir=/opt/trinity/bin \ --libdir=/opt/trinity/lib64 \ --datadir=/opt/trinity/share \ --includedir=/opt/trinity/include/tde \ --enable-closure make -j3 || make François, hold on, the script for conversion where => tde I already have ready! As soon as possible I puts it into GIT. New GIT repository is available at git clone http://scm.trinitydesktop.org/scm/git/kasablanca Debian/Ubuntu packaging files have been added to the tde-packaging repository. cgit, the master GIT repository, and the autobuild system have not yet been updated. As I have now tested the current case GIT tree - with updated convert_existing_kde3_app_to_tde: Doxyfile | 2 +- acinclude.m4 | 230 ++++++++++++++++++++++----------------------- doc/Makefile.am | 2 +- doc/en/Makefile.am | 2 +- doc/en/index.docbook | 6 +- kasablanca.kdevelop | 4 +- kasablanca.kdevses | 2 +- src/Q_bookmarkdialog.cpp | 4 +- src/Q_bookmarkdialog.ui | 4 +- src/Q_userinterfacepreferencesdialog.cpp | 4 +- src/Q_userinterfacepreferencesdialog.ui | 4 +- src/bookmarkdialog.cpp | 4 +- src/ftpsession.cpp | 6 +- src/importdialog.cpp | 2 +- src/kasablanca.cpp | 26 ++--- src/kasablanca.h | 10 +- src/kbconfig.cpp | 2 +- src/kbtaskview.cpp | 2 +- src/kbtaskview.h | 4 +- src/main.cpp | 8 +- 20 files changed, 164 insertions(+), 164 deletions(-) FTBFS because "src/kbconfig.kcfg" contains "QFont" instead of "TQFont". Please update manually in GIT. I've an updated QT3/TQT3 conversion script so that it parses ".kcfg" files too. Thanks Also, "doc/en/Makefile.am" contains "TDE_LANG" instead of "KDE_LANG". This will cause the HTML documentation not to build. (In reply to comment #6) > Also, "doc/en/Makefile.am" contains "TDE_LANG" instead of "KDE_LANG". > This will cause the HTML documentation not to build. (In reply to comment #5) > FTBFS because "src/kbconfig.kcfg" contains "QFont" instead of "TQFont". > Please update manually in GIT. > > I've an updated QT3/TQT3 conversion script so that it parses ".kcfg" files too. > Thanks Fixed in GIT hash 32a5d00. (In reply to comment #6) > Also, "doc/en/Makefile.am" contains "TDE_LANG" instead of "KDE_LANG". > This will cause the HTML documentation not to build. Fixed in GIT hash 7f6c69e. Build OK from GIT. cgit, the master GIT repository, and the autobuild system have now been updated. Marking NEEDINFO pending results of autobuilds on build farm. Sorry still an issue in "src/Makefile.am" : TDE_ICON should be renamed to KDE_ICON . Fixed in GIT hash 6235f9e1. François, it is possible that KDE_ICON renaming occurred with your initial script for kde3=>tde conversion? With updated script this rename does not occur. Possibly, but if you look at earlier comment in this thread, I have written a seconde command to explicitely rename these errors in ".am" files. BTW the RPM package is correct now, thank you. (Odpověď na komentář #13) > Possibly, but if you look at earlier comment in this thread, I have written a > seconde command to explicitely rename these errors in ".am" files. > > BTW the RPM package is correct now, thank you. Good point. However, it is apparent that this undesirable conversion occurred previously: http://git.trinitydesktop.org/cgit/kasablanca/commit/src/Makefile.am?id=dacae0242e905268e9df9aed83f84e91b13a1749 Importantly, we have verified that the actual conversion script does not cause this error. FTBFS in recent distro because "src/Makefile.am" contains $(LIB_TQT) instead of $(LIB_QT) . (Odpověď na komentář #15)
> FTBFS in recent distro because "src/Makefile.am" contains $(LIB_TQT) instead
> of $(LIB_QT) .
Fixed in GIT hash f4c84e46.
OK thanks, this time, package builds on both old distro and recent distro. Debian/Ubuntu packaging files are ready for build. Thank you all for your efforts in preparing the package. The package seems to be ready. |