Le jeudi 11 mars 2021 00:24:00 CET, vous avez écrit :
> Dear Laurant, dear Denis, dear science team,
>
> I took a look into QElectroTech 0.8.0, released 2021-02-21, to
> update the package in Debian (not targeted for Debian 11
> bullseye, of course). See (1) and (2)
>
> Version 0.8.0 uses a cmake feature, that has not been used in
> 0.7.0, FetchContent_Declare, which seems to try downloads of
> library code from various git repositories during build.
>
> Of course, this is a strict no-go in Debian and most other
> distributions. Also, it is not necessary, because all the needed
> packages are present in Debian, as far as I can tell. (3)
>
> I have to confess, that I don't know anything about cmake, and
> my naive attempts of just using "DOWNLOAD_COMMAND true" and
> removing the GIT_ directives failed.
>
> Therefore I ask for your help in correctly building the package
> for Debian (and other distributions) by using the existing
> Debian packages instead of using FetchContent_Declare.
>
> I'm willing to apply any patches, to test results, and to
> upload, but I don't have the capacity to learn cmake and the
> subtleties of the Qt ecosystem. Therefore I need some help!
>
> Many thanks in advance for any support in that matter!
>
> Cheers
>
> (1) https://tracker.debian.org/pkg/qelectrotech
> (2) https://salsa.debian.org/science-team/qelectrotech
> (3) catch2, extra-cmake-modules, googletest, libpugixml-dev,
> libsingleapplication-dev, and ls5-dev
Dear Martin,
I don't use GIT on my package, see my quilt patch
Cheers,
Laurent
--- qelectrotech-0.80.r6708.orig/sources/machine_info.cpp
+++ qelectrotech-0.80.r6708/sources/machine_info.cpp
@@ -81,7 +81,6 @@
qInfo()<< "Qt library location Qt settings:"
<< QLibraryInfo::location(QLibraryInfo::SettingsPath);
#endif
- qInfo() << "GitRevision " + QString(GIT_COMMIT_SHA);
qInfo()<< "QElectroTech V " + QET::displayedVersion;
qInfo()<< tr("Compilation : ") + pc.built.version;
qInfo()<< "Built with Qt " + pc.built.QT
--- qelectrotech-0.80.r6777.orig/qelectrotech.pro
+++ qelectrotech-0.80.r6777/qelectrotech.pro
@@ -5,21 +5,21 @@
# Chemins utilises pour la compilation et l'installation de QET
unix {
# Chemins UNIX
- COMPIL_PREFIX = '/usr/local/'
- INSTALL_PREFIX = '/usr/local/'
+ COMPIL_PREFIX = '/usr/'
+ INSTALL_PREFIX = '/usr/'
QET_BINARY_PATH = 'bin/'
QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/'
QET_LANG_PATH = 'share/qelectrotech/lang/'
QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
- QET_LICENSE_PATH = 'doc/qelectrotech/'
- QET_MIME_XML_PATH = '../share/mime/application/'
- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/'
- QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
+ QET_LICENSE_PATH = 'share/doc/qelectrotech/'
+ QET_MIME_XML_PATH = 'share/mime/application/'
+ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/'
+ QET_MIME_PACKAGE_PATH = 'share/mime/packages/'
QET_DESKTOP_PATH = 'share/applications/'
QET_ICONS_PATH = 'share/icons/hicolor/'
- QET_MAN_PATH = 'man/'
- QET_APPDATA_PATH = 'share/appdata'
+ QET_MAN_PATH = 'share/man/'
+ #QET_APPDATA_PATH = 'share/appdata'
}
win32 {
# Chemins Windows
@@ -75,11 +75,11 @@
DEFINES += QAPPLICATION_CLASS=QApplication
DEFINES += QT_MESSAGELOGCONTEXT
-DEFINES += GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""
+#DEFINES += GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
# You can make your code warn on compile time for the TODO's
# In order to do so, uncomment the following line.
@@ -241,7 +241,7 @@
examples.files = examples/*
copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
-copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
+copyright.files = CREDIT README ChangeLog
mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
mime_xml.files = misc/x-qet-*.xml
@@ -255,27 +255,27 @@
desktop.path = $$join(INSTALL_PREFIX,,,$${QET_DESKTOP_PATH})
desktop.files = misc/qelectrotech.desktop
-appdata.path = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH})
-appdata.files = misc/qelectrotech.appdata.xml
+#appdata.path = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH})
+#appdata.files = misc/qelectrotech.appdata.xml
-icons.path = $$join(INSTALL_PREFIX,,,$${QET_ICONS_PATH})
-icons.files = ico/breeze-icons/16x16 \
- ico/breeze-icons/22x22 \
- ico/breeze-icons/32x32 \
- ico/breeze-icons/48x48 \
- ico/breeze-icons/64x64 \
- ico/breeze-icons/128x128 \
- ico/breeze-icons/256x256
+#icons.path = $$join(INSTALL_PREFIX,,,$${QET_ICONS_PATH})
+#icons.files = ico/breeze-icons/16x16 \
+# ico/breeze-icons/22x22 \
+# ico/breeze-icons/32x32 \
+# ico/breeze-icons/48x48 \
+# ico/breeze-icons/64x64 \
+# ico/breeze-icons/128x128 \
+# ico/breeze-icons/256x256
man.path = $$join(INSTALL_PREFIX,,,$${QET_MAN_PATH})
man.files = man/files/*
-man.extra = sh man/compress_man_pages.sh
+#man.extra = sh man/compress_man_pages.sh
# L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
INSTALLS += target elements tbt lang copyright
# Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
unix {
- INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
+ INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples
}
# Options de compilation communes a Unix et MacOS X
--
debian-science-maintainers mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
