View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0010037 | Scribus | Build System | public | 2011-06-09 13:29 | 2011-07-07 20:32 |
Reporter | sharkcz | Assigned To | cbradney | ||
Priority | normal | Severity | block | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Product Version | 1.4.0svn | ||||
Fixed in Version | 1.4.0svn | ||||
Summary | 0010037: can't be built with cups 1.5 | ||||
Description | scribus 1.4.0-rc4 can't be built on Fedora Rawhide because cups 1.5 changes the way how are individual headers included. [ 66%] Building CXX object scribus/CMakeFiles/scribus.dir/cupsoptions.cpp.o cd /builddir/build/BUILD/scribus-1.4.0.rc4/build/scribus && /usr/bin/c++ -DNDEBUG -DHAVE_CARBON=1 -DQT_GUI_LIB -DQT_XML_LIB -DQT_NETWORK_LIB -DQT_CO RE_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_THREAD_LIB -DQT_XML_LIB -DHAVE_DLFCN_H -DHAVE_UNISTD_H -DHAVE_CONFIG_H -DQT_NO_DEBUG -O2 -g -pipe -Wall -Wp,-D_ FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -fPIC -I/builddir/build/BUILD/scribus-1.4.0.r c4/build/scribus -I/builddir/build/BUILD/scribus-1.4.0.rc4/scribus -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include/QtNetwork -I/usr/include/Q tCore -I/builddir/build/BUILD/scribus-1.4.0.rc4/build -I/usr/include/QtDesigner -I/usr/include/QtDeclarative -I/usr/include/QtScriptTools -I/usr/inclu de/QtDBus -I/usr/include/QtSql -I/usr/include/QtOpenGL -I/usr/include/QtMultimedia -I/usr/include/QtXmlPatterns -I/usr/include/QtHelp -I/usr/include/Q tUiTools -I/usr/include/QtTest -I/usr/include/QtScript -I/usr/include/QtSvg -I/usr/include/Qt3Support -I/usr/lib64/qt4/mkspecs/default -I/usr/include/ libxml2 -I/usr/include/python2.7 -I/builddir/build/BUILD/scribus-1.4.0.rc4 -I/usr/include/freetype2 -I/usr/include/cairo -DSHAREDIR=\"/usr/share/sc ribus/\" -DDOCDIR=\"/usr/share/doc/scribus/\" -DICONDIR=\"/usr/share/scribus/icons/\" -DSAMPLESDIR=\"/usr/share/scribus/samples/\" -DSCRIPTSDIR=\"/usr /share/scribus/scripts/\" -DTEMPLATEDIR=\"/usr/share/scribus/templates/\" -DDESKTOPDIR=\"/usr/share/applications/\" -DLIBDIR=\"/usr/lib64/scribus/\" - DPLUGINDIR=\"/usr/lib64/scribus/plugins/\" -o CMakeFiles/scribus.dir/cupsoptions.cpp.o -c /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions. cpp /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp: In constructor 'CupsOptions::CupsOptions(QWidget*, QString)': /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:77:2: error: 'ppd_file_t' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:77:14: error: 'ppd' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:78:2: error: 'ppd_group_t' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:78:15: error: 'group' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:81:98: error: 'ppdOpenFile' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:83:22: error: 'ppdMarkDefaults' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:84:56: error: 'cupsMarkOptions' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:92:4: error: 'ppd_option_t' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:92:18: error: 'option' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:93:4: error: 'ppd_choice_t' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:93:18: error: 'choice' was not declared in this scope /builddir/build/BUILD/scribus-1.4.0.rc4/scribus/cupsoptions.cpp:127:15: error: 'ppdClose' was not declared in this scope | ||||
Additional Information | proposed fix for trunk (should work with both cups 1.4 and 1.5) diff --git a/Scribus/scribus/ui/cupsoptions.cpp b/Scribus/scribus/ui/cupsoptions.cpp index 134bead..34edc06 100644 --- a/Scribus/scribus/ui/cupsoptions.cpp +++ b/Scribus/scribus/ui/cupsoptions.cpp @@ -42,6 +42,7 @@ for which a new license (GPL+exception) is in place. #include "scconfig.h" #ifdef HAVE_CUPS #include <cups/cups.h> +#include <cups/ppd.h> #endif #include "util_icon.h" diff --git a/Scribus/scribus/util_printer.cpp b/Scribus/scribus/util_printer.cpp index 8d08cba..1b173cd 100644 --- a/Scribus/scribus/util_printer.cpp +++ b/Scribus/scribus/util_printer.cpp @@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. #if defined( HAVE_CUPS ) #include <cups/cups.h> + #include <cups/ppd.h> #elif defined(_WIN32) #include <windows.h> #include <winspool.h> | ||||
Tags | No tags attached. | ||||
Patch | |||||
Date Modified | Username | Field | Change |
---|---|---|---|
2011-06-09 13:29 | sharkcz | New Issue | |
2011-06-09 18:35 | cbradney | Assigned To | => cbradney |
2011-06-09 18:35 | cbradney | Status | new => assigned |
2011-06-09 18:37 | cbradney | Note Added: 0026347 | |
2011-06-09 18:37 | cbradney | Status | assigned => resolved |
2011-06-09 18:37 | cbradney | Fixed in Version | => 1.4.0svn |
2011-06-09 18:37 | cbradney | Resolution | open => fixed |
2011-07-07 20:32 | cbradney | Status | resolved => closed |