spacepaste

Paste details

reply | raw

  1.  
  2. diff --git a/configure.rb b/configure.rb
  3. index 23f3dcc9..951db1fa 100755
  4. --- a/configure.rb
  5. +++ b/configure.rb
  6. @@ -108,7 +108,7 @@ _EOH_
  7. quazipDir = conf.argumentValue("with-quazip")
  8. if File.directory? quazipDir
  9. quazipLib = quazipDir + "/lib"
  10. - quazipInclude = quazipDir + "/include"
  11. + quazipInclude = quazipDir + "/include/quazip5"
  12. config.addLib("-L" + quazipLib)
  13. config.addIncludePath(quazipInclude)
  14. else
  15. diff --git a/configure.tests/quazip/main.cpp b/configure.tests/quazip/main.cpp
  16. index f9ec3753..cf1820da 100644
  17. --- a/configure.tests/quazip/main.cpp
  18. +++ b/configure.tests/quazip/main.cpp
  19. @@ -33,8 +33,8 @@
  20. * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  21. ***************************************************************************/
  23. -#include "quazip/quazip.h"
  24. -#include "quazip/quazipfile.h"
  25. +#include "quazip5/quazip.h"
  26. +#include "quazip5/quazipfile.h"
  27. #include <QFile>
  29. int main()
  30. diff --git a/configure.tests/quazip/quazip.pro b/configure.tests/quazip/quazip.pro
  31. index 4db2eeb8..b9e21faa 100755
  32. --- a/configure.tests/quazip/quazip.pro
  33. +++ b/configure.tests/quazip/quazip.pro
  34. @@ -10,7 +10,7 @@ macx {
  35. }
  37. unix:!macx {
  38. - INCLUDEPATH += /usr/include/quazip
  39. + INCLUDEPATH += /usr/include/quazip5
  40. }
  42. LIBS += -lz
  43. diff --git a/configure.tests/quazip/quazip.qonf b/configure.tests/quazip/quazip.qonf
  44. index 7d259a82..da8aa2ca 100755
  45. --- a/configure.tests/quazip/quazip.qonf
  46. +++ b/configure.tests/quazip/quazip.qonf
  47. @@ -8,7 +8,7 @@
  48. <define value="HAVE_QUAZIP" />
  49. </defines>
  50. <includes>
  51. - <include path="/usr/include/quazip/" />
  52. + <include path="/usr/include/quazip5/" />
  53. </includes>
  54. </provide>
  55. <solution>
  56. diff --git a/qonf/test.rb b/qonf/test.rb
  57. index ba63f319..d746377c 100755
  58. --- a/qonf/test.rb
  59. +++ b/qonf/test.rb
  60. @@ -98,12 +98,12 @@ class Test
  61. if conf.hasArgument?("with-quazip")
  62. quazipDir = conf.argumentValue("with-quazip")
  63. quazipLib = quazipDir + "/lib"
  64. - extraLib += "-L#{quazipLib} -lquazip"
  65. - extraInclude = quazipDir + "/include"
  66. + extraLib += "-L#{quazipLib} -lquazip5"
  67. + extraInclude = quazipDir + "/include/quazip5"
  68. qmakeLine = "'LIBS += #{extraLib}'"
  69. qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
  70. else
  71. - extraLib = "-lquazip-qt5"
  72. + extraLib = "-lquazip5"
  73. qmakeLine = "'LIBS += #{extraLib}'"
  74. end
  75. else
  76. @@ -174,9 +174,9 @@ class Test
  77. }
  79. if conf.hasArgument?("with-quazip")
  80. - config.addLib("-lquazip")
  81. + config.addLib("-lquazip5")
  82. else
  83. - config.addLib("-lquazip-qt5")
  84. + config.addLib("-lquazip5")
  85. end
  87. # config.addLib("-lquazip-qt5")
  88. diff --git a/src/libtupi/tuppackagehandler.h b/src/libtupi/tuppackagehandler.h
  89. index 413bae8a..5e623971 100644
  90. --- a/src/libtupi/tuppackagehandler.h
  91. +++ b/src/libtupi/tuppackagehandler.h
  92. @@ -38,8 +38,8 @@
  94. #include "tglobal.h"
  95. #include "tapplicationproperties.h"
  96. -#include "quazip/quazip.h"
  97. -#include "quazip/quazipfile.h"
  98. +#include "quazip5/quazip.h"
  99. +#include "quazip5/quazipfile.h"
  101. // SQA: Pending to enable in the future
  102. // #include "quazip/JlCompress.h"
  103.  
Powered by spacepaste. Paste removal.