Source: unixodbc-gui-qt Version: 2.3.0-2 Tags: patch User: [email protected] Usertags: qt48-transition
Hi, Your package fails to build against Qt 4.8 which is currently in experimental. The transition to unstable/testing is tracked in bug #653903. I'm attaching a patch that contains the necessary changes. It can be applied even before Qt 4.8 enters unstable. Build log: > g++ -DPACKAGE_NAME=\"unixODBC-GUI-Qt\" -DPACKAGE_TARNAME=\"unixodbc-gui-qt\" > -DPACKAGE_VERSION=\"2.3.0\" -DPACKAGE_STRING=\"unixODBC-GUI-Qt\ 2.3.0\" > -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"unixodbc-gui-qt\" > -DVERSION=\"2.3.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 > -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 > -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SEM_H=1 > -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" > -DMODULEDIR=\"/usr/lib/i386-linux-gnu/odbc\" -DHAVE_LIBCRYPT=1 > -DHAVE_READLINE_HISTORY_H=1 -DHAVE_READLINE=1 -DTIME_WITH_SYS_TIME=1 > -DHAVE_SYS_TIME_H=1 -DSIZEOF_LONG=4 -DHAVE_LONG_LONG=1 -DSIZEOF_LONG_INT=4 > -DHAVE_STRCASECMP=1 -DHAVE_STRNCASECMP=1 -DHAVE_VSNPRINTF=1 -DHAVE_STRTOL=1 > -DHAVE_ATOLL=1 -DHAVE_STRTOLL=1 -DHAVE_ENDPWENT=1 -DHAVE_GETTIMEOFDAY=1 > -DHAVE_FTIME=1 -DHAVE_TIME=1 -DHAVE_LIBPTHREAD=1 -D_REENTRANT=1 > -DHAVE_LOCALTIME_R=1 -DHAVE_FTOK=1 -DHAVE_SEMGET=1 -DHAVE_SHMGET=1 > -DHAVE_SEMOP=1 -DHAVE_SNPRINTF=1 -DNEED_SEMUNDO_UNION=1 -DCOLLECT_STATS=1 > -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_PWD_H=1 > -DHAVE_CRYPT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 > -DHAVE_LOCALE_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_SEM_H=1 -DHAVE_STDARG_H=1 > -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_TIMEB_H=1 -DHAVE_TIME_H=1 -DHAVE_DIRENT_H=1 > -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_VPRINTF=1 -DHAVE_PUTENV=1 > -DHAVE_SOCKET=1 -DHAVE_STRDUP=1 -DHAVE_STRSTR=1 -DHAVE_SETENV=1 > -DHAVE_SETLOCALE=1 -DHAVE_STRCHR=1 -I. -I/usr/include/qt4 > -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui > -I/usr/include/qt4/QtAssistant -I/usr/include/qt4/QtNetwork > -DSYSTEM_FILE_PATH=\"/etc\" -I../libltdl -D_FORTIFY_SOURCE=2 -g -O2 -pipe > -DV_MAJOUR=1 -DV_MINOR=0 -DV_RELEASE=1 -c -o mattr.o mattr.cpp > mattr.cpp:14:2: error: #error "This file was generated using the moc from > 4.7.1. It" > mattr.cpp:15:2: error: #error "cannot be used with the include files from > this version of Qt." > mattr.cpp:16:2: error: #error "(The moc has changed too much.)" > make[2]: *** [mattr.o] Error 1 > make[2]: Leaving directory `/build/buildd/unixodbc-gui-qt-2.3.0/ODBCTestQ4' Regards, Felix
diff -u unixodbc-gui-qt-2.3.0/debian/rules unixodbc-gui-qt-2.3.0/debian/rules --- unixodbc-gui-qt-2.3.0/debian/rules +++ unixodbc-gui-qt-2.3.0/debian/rules @@ -6,17 +6,20 @@ # always force the check for undefined symbols export LDFLAGS=-Wl,-z,defs +CONFIGURE = CXXFLAGS="-g -O2 -pipe" \ + dh_auto_configure -- --with-qt_dir_include=/usr/include/qt4 \ + --enable-static --without-pth + %: dh $@ override_dh_auto_configure: autotools - # remove all moc-autogenerated files, without which this won't build - # with Qt4. - rm -f odbcinstQ4/mC*.cpp - # Add here commands to configure the package. - CXXFLAGS="-g -O2 -pipe" \ - dh_auto_configure -- --with-qt_dir_include=/usr/include/qt4 \ - --enable-static --without-pth + # configure and the clean to remove all moc-autogenerated files, + # without which this won't build with Qt4. + $(CONFIGURE) + dh_auto_clean + + $(CONFIGURE) override_dh_auto_clean: dh_auto_clean
