pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

calibre3: fix build and PLIST.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Jan 31 11:39:05 2018 +0100
Changeset:	5466fac7c456b4d6789e25df402c5471e270d126

Modified Files:
	calibre3/Makefile
	calibre3/PLIST
	calibre3/distinfo
	calibre3/patches/patch-setup_build.py

Log Message:
calibre3: fix build and PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5466fac7c456b4d6789e25df402c5471e270d126

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 calibre3/Makefile                     | 39 +++++++++++----------------------
 calibre3/PLIST                        | 41 +++++++++++------------------------
 calibre3/distinfo                     |  2 +-
 calibre3/patches/patch-setup_build.py |  9 --------
 4 files changed, 27 insertions(+), 64 deletions(-)

diffs:
diff --git a/calibre3/Makefile b/calibre3/Makefile
index f12b2b3006..fafd34232f 100644
--- a/calibre3/Makefile
+++ b/calibre3/Makefile
@@ -12,32 +12,29 @@ HOMEPAGE=	http://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
-#DEPENDS+=	help2man>=1.36.4:../../converters/help2man
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
-#DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
-DEPENDS+=	${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
-DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
+DEPENDS+=	${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
+DEPENDS+=	${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
-DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
-DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
-DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
+DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
-DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+# for installation
+BUILD_DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 
 EXTRACT_USING=	bsdtar
 
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 3.16.0
+
 USE_LANGUAGES=			c c++
 USE_LIBTOOL=			yes
 USE_TOOLS+=			pkg-config pax
-PYTHON_VERSIONS_ACCEPTED=	27
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup
-PYDISTUTILSPKG=			yes
 PYSETUPOPTARGS=			# empty
 PYSETUPINSTALLARGS=		--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 
@@ -85,11 +82,6 @@ MAKE_ENV+=		PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
 MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 MAKE_ENV+=		SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 MAKE_ENV+=		LFLAGS=${LDFLAGS:Q}
-#MAKE_ENV+=		WITH_USB=no
-
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-pre-configure:
-	cd ${WRKSRC} && rm -rf src/cherrypy
 
 # Turn off x bits on non-executable files.
 post-extract:
@@ -98,15 +90,12 @@ post-extract:
 	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
 	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 
-# not sure why libheadless installed into wrong directory
-# side effect of patch-setup_extensions.py?
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
 	    ${DESTDIR}${PREFIX}/share/calibre/recipes
 	cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
 	    COPYRIGHT INSTALL LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
-	cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
 	${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
 
 .include "../../lang/python/application.mk"
@@ -125,7 +114,6 @@ _PYSETUPTOOLSINSTALLARGS=	# empty
 # Get rid of --root=${DESTDIR}, use our own version from above instead.
 # because the setup.py is not the standard one and behaves differently.
 _PYSETUPINSTALLARGS=	${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
-#.include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.8.2
 .include "../../print/podofo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.20.2
@@ -138,7 +126,6 @@ BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../textproc/py-elementtree/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
diff --git a/calibre3/PLIST b/calibre3/PLIST
index de41c66e4e..e243bf38b1 100644
--- a/calibre3/PLIST
+++ b/calibre3/PLIST
@@ -86,9 +86,6 @@ lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
 lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/apple/__init__.py
-lib/calibre/calibre/devices/apple/driver.py
-lib/calibre/calibre/devices/apple/itunes.py
 lib/calibre/calibre/devices/binatone/__init__.py
 lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
@@ -1003,7 +1000,6 @@ lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
 lib/calibre/calibre/gui2/store/stores/bn_plugin.py
 lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py
 lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py
-lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
 lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -1016,7 +1012,6 @@ lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
 lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
-lib/calibre/calibre/gui2/store/stores/koobe_plugin.py
 lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
 lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/litres_plugin.py
@@ -1039,6 +1034,7 @@ lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
 lib/calibre/calibre/gui2/store/stores/publio_plugin.py
 lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
 lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py
 lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
 lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
@@ -1349,6 +1345,7 @@ lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/run_tests.py
 lib/calibre/calibre/utils/search_query_parser.py
+lib/calibre/calibre/utils/search_query_parser_test.py
 lib/calibre/calibre/utils/serialize.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
@@ -1457,6 +1454,7 @@ lib/calibre/tinycss/token_data.py
 lib/calibre/tinycss/tokenizer.py
 lib/calibre/tinycss/version.py
 ${PYSITELIB}/init_calibre.py
+share/bash-completion/completions/calibre
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
 share/calibre/calibre-ebook-root-CA.crt
@@ -1694,6 +1692,7 @@ share/calibre/images/reader.png
 share/calibre/images/remove_books.png
 share/calibre/images/reports.png
 share/calibre/images/resize.png
+share/calibre/images/restart.png
 share/calibre/images/rotate-right.png
 share/calibre/images/save.png
 share/calibre/images/scheduler.png
@@ -1704,6 +1703,7 @@ share/calibre/images/search_add_saved.png
 share/calibre/images/search_copy_saved.png
 share/calibre/images/search_delete_saved.png
 share/calibre/images/series.png
+share/calibre/images/similar.png
 share/calibre/images/smarten-punctuation.png
 share/calibre/images/snippets.png
 share/calibre/images/sort.png
@@ -1772,9 +1772,9 @@ share/calibre/recipes/20_minutos.recipe
 share/calibre/recipes/20minutes.recipe
 share/calibre/recipes/20minutos.recipe
 share/calibre/recipes/24sata.recipe
-share/calibre/recipes/24sata_rs.recipe
 share/calibre/recipes/3dnews.recipe
 share/calibre/recipes/7seri.recipe
+share/calibre/recipes/7x7.recipe
 share/calibre/recipes/Ansa.recipe
 share/calibre/recipes/DrawAndCook.recipe
 share/calibre/recipes/ZIVE.sk.recipe
@@ -1804,8 +1804,6 @@ share/calibre/recipes/air_force_times.recipe
 share/calibre/recipes/ajc.recipe
 share/calibre/recipes/ajiajin.recipe
 share/calibre/recipes/aksiyon_derigisi.recipe
-share/calibre/recipes/akter.recipe
-share/calibre/recipes/akter_dnevnik.recipe
 share/calibre/recipes/aktualne.cz.recipe
 share/calibre/recipes/al_ahram.recipe
 share/calibre/recipes/al_jazeera.recipe
@@ -1815,7 +1813,6 @@ share/calibre/recipes/albert_mohler.recipe
 share/calibre/recipes/albertslundlokalavisen_dk.recipe
 share/calibre/recipes/alejakomiksu_com.recipe
 share/calibre/recipes/alleroedlokalavisen_dk.recipe
-share/calibre/recipes/alo_novine.recipe
 share/calibre/recipes/alt_om_herning.recipe
 share/calibre/recipes/alternet.recipe
 share/calibre/recipes/altomdata_dk.recipe
@@ -1895,8 +1892,6 @@ share/calibre/recipes/berlin_policy_journal.recipe
 share/calibre/recipes/berliner_zeitung.recipe
 share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/berria.recipe
-share/calibre/recipes/beta.recipe
-share/calibre/recipes/beta_en.recipe
 share/calibre/recipes/biamag.recipe
 share/calibre/recipes/biamag_en.recipe
 share/calibre/recipes/bianet.recipe
@@ -1910,7 +1905,6 @@ share/calibre/recipes/birgun_gazetesi.recipe
 share/calibre/recipes/birmingham_evening_mail.recipe
 share/calibre/recipes/birmingham_post.recipe
 share/calibre/recipes/bitacora.recipe
-share/calibre/recipes/biweekly.recipe
 share/calibre/recipes/biz_portal.recipe
 share/calibre/recipes/blesk.recipe
 share/calibre/recipes/blic.recipe
@@ -1922,6 +1916,7 @@ share/calibre/recipes/boston.com.recipe
 share/calibre/recipes/boxis.recipe
 share/calibre/recipes/brand_eins.recipe
 share/calibre/recipes/brasil_de_fato.recipe
+share/calibre/recipes/breaking_mad.recipe
 share/calibre/recipes/brecha.recipe
 share/calibre/recipes/brewiarz.recipe
 share/calibre/recipes/brigitte_de.recipe
@@ -2029,6 +2024,7 @@ share/calibre/recipes/courrierinternational.recipe
 share/calibre/recipes/cracked_com.recipe
 share/calibre/recipes/craigslist.recipe
 share/calibre/recipes/credit_slips.recipe
+share/calibre/recipes/cronica.recipe
 share/calibre/recipes/csid.recipe
 share/calibre/recipes/ct24.recipe
 share/calibre/recipes/cubadebate.recipe
@@ -2136,6 +2132,8 @@ share/calibre/recipes/drivelry.recipe
 share/calibre/recipes/drytooling_pl.recipe
 share/calibre/recipes/dunya_bizim.recipe
 share/calibre/recipes/dunya_bulteni.recipe
+share/calibre/recipes/dunyahalleri.recipe
+share/calibre/recipes/dunyahalleri_haftaninozeti.recipe
 share/calibre/recipes/dvhn.recipe
 share/calibre/recipes/dwutygodnik.recipe
 share/calibre/recipes/dzial_zagraniczny.recipe
@@ -2147,7 +2145,6 @@ share/calibre/recipes/dziennik_polski.recipe
 share/calibre/recipes/dziennik_wschodni.recipe
 share/calibre/recipes/dziennik_zachodni.recipe
 share/calibre/recipes/dziennikzwiazkowy.recipe
-share/calibre/recipes/e_novine.recipe
 share/calibre/recipes/ebeltoftlokalavisen_dk.recipe
 share/calibre/recipes/ebetrsberger_zeitung.recipe
 share/calibre/recipes/echo_dnia.recipe
@@ -2194,6 +2191,7 @@ share/calibre/recipes/el_publico.recipe
 share/calibre/recipes/el_tiempo.recipe
 share/calibre/recipes/el_universal.recipe
 share/calibre/recipes/elclubdelebook.recipe
+share/calibre/recipes/elcohetealaluna.recipe
 share/calibre/recipes/elcomercio.recipe
 share/calibre/recipes/ele.recipe
 share/calibre/recipes/elektroda_pl.recipe
@@ -2209,7 +2207,6 @@ share/calibre/recipes/eluniversal_ve.recipe
 share/calibre/recipes/eluniversalimpresa.recipe
 share/calibre/recipes/eluniverso_ec.recipe
 share/calibre/recipes/emg_en.recipe
-share/calibre/recipes/emg_rs.recipe
 share/calibre/recipes/empire_magazine.recipe
 share/calibre/recipes/endgadget.recipe
 share/calibre/recipes/endgadget_ja.recipe
@@ -2336,9 +2333,7 @@ share/calibre/recipes/gildia_pl.recipe
 share/calibre/recipes/gizmodo.recipe
 share/calibre/recipes/gkt.recipe
 share/calibre/recipes/glamour.recipe
-share/calibre/recipes/glas_srpske.recipe
 share/calibre/recipes/glasgow_herald.recipe
-share/calibre/recipes/glasjavnosti.recipe
 share/calibre/recipes/glenn_greenwald.recipe
 share/calibre/recipes/glennbeck.recipe
 share/calibre/recipes/globaltimes.recipe
@@ -2485,8 +2480,6 @@ share/calibre/recipes/insan_okur.recipe
 share/calibre/recipes/insider.recipe
 share/calibre/recipes/instapaper.recipe
 share/calibre/recipes/intelligencer.recipe
-share/calibre/recipes/interia_fakty.recipe
-share/calibre/recipes/interia_sport.recipe
 share/calibre/recipes/intrefete.recipe
 share/calibre/recipes/io9.recipe
 share/calibre/recipes/iol_za.recipe
@@ -2495,7 +2488,6 @@ share/calibre/recipes/iprofesional.recipe
 share/calibre/recipes/irish_independent.recipe
 share/calibre/recipes/irish_times.recipe
 share/calibre/recipes/isar-loisachbote.recipe
-share/calibre/recipes/ittechblog.recipe
 share/calibre/recipes/ivanamilakovic.recipe
 share/calibre/recipes/ixbt.recipe
 share/calibre/recipes/izvestia.recipe
@@ -2567,7 +2559,6 @@ share/calibre/recipes/kp.recipe
 share/calibre/recipes/krebs_on_security.recipe
 share/calibre/recipes/kresy_pl.recipe
 share/calibre/recipes/kristeligt_dagblad_dk.recipe
-share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
 share/calibre/recipes/ksiazka_pl.recipe
 share/calibre/recipes/kstar.recipe
@@ -2636,7 +2627,6 @@ share/calibre/recipes/lesoir_be.recipe
 share/calibre/recipes/letsgetcritical.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/lexpress.recipe
-share/calibre/recipes/libartes.recipe
 share/calibre/recipes/liberation.recipe
 share/calibre/recipes/liberatorio_politico.recipe
 share/calibre/recipes/libero.recipe
@@ -2648,7 +2638,6 @@ share/calibre/recipes/lifehacker_pl.recipe
 share/calibre/recipes/lightspeed_magazine.recipe
 share/calibre/recipes/limba_sarda.recipe
 share/calibre/recipes/limes.recipe
-share/calibre/recipes/linux_journal.recipe
 share/calibre/recipes/linux_magazine.recipe
 share/calibre/recipes/linuxportal_pl.recipe
 share/calibre/recipes/list_apart.recipe
@@ -2730,7 +2719,6 @@ share/calibre/recipes/monden.recipe
 share/calibre/recipes/money_pl.recipe
 share/calibre/recipes/moneycontrol.recipe
 share/calibre/recipes/moneyro.recipe
-share/calibre/recipes/monitor.recipe
 share/calibre/recipes/montevideo_com.recipe
 share/calibre/recipes/montreal_gazette.recipe
 share/calibre/recipes/more_intelligent_life.recipe
@@ -2823,7 +2811,6 @@ share/calibre/recipes/novinite.recipe
 share/calibre/recipes/novinite_bg.recipe
 share/calibre/recipes/novinky.cz.recipe
 share/calibre/recipes/novinky.recipe
-share/calibre/recipes/novistandard.recipe
 share/calibre/recipes/novosti.recipe
 share/calibre/recipes/now_toronto.recipe
 share/calibre/recipes/nowa_fantastyka.recipe
@@ -2859,6 +2846,7 @@ share/calibre/recipes/nzz_ger.recipe
 share/calibre/recipes/nzz_webpaper.recipe
 share/calibre/recipes/o_globo.recipe
 share/calibre/recipes/oakland_north.recipe
+share/calibre/recipes/oba.recipe
 share/calibre/recipes/observa_digital.recipe
 share/calibre/recipes/observatorul_cultural.recipe
 share/calibre/recipes/observer.recipe
@@ -2888,7 +2876,6 @@ share/calibre/recipes/osworld_pl.recipe
 share/calibre/recipes/ottawa_citizen.recipe
 share/calibre/recipes/ourdailybread.recipe
 share/calibre/recipes/outlook_india.recipe
-share/calibre/recipes/overclock_pl.recipe
 share/calibre/recipes/oxford_mail.recipe
 share/calibre/recipes/padreydecano.recipe
 share/calibre/recipes/pagina12.recipe
@@ -2958,7 +2945,6 @@ share/calibre/recipes/poughkeepsie_journal.recipe
 share/calibre/recipes/ppe_pl.recipe
 share/calibre/recipes/praguemonitor.recipe
 share/calibre/recipes/pravda.recipe
-share/calibre/recipes/pravda_en.recipe
 share/calibre/recipes/pravda_it.recipe
 share/calibre/recipes/pravda_por.recipe
 share/calibre/recipes/pravda_rs.recipe
@@ -3023,6 +3009,7 @@ share/calibre/recipes/revista_muy.recipe
 share/calibre/recipes/revista_piaui.recipe
 share/calibre/recipes/revista_semana.recipe
 share/calibre/recipes/revista_summa.recipe
+share/calibre/recipes/revista_veintitres.recipe
 share/calibre/recipes/rga.recipe
 share/calibre/recipes/rheinische_post.recipe
 share/calibre/recipes/ria_ru.recipe
@@ -3168,7 +3155,6 @@ share/calibre/recipes/tagesspiegel.recipe
 share/calibre/recipes/taggeschau_de.recipe
 share/calibre/recipes/taipei.recipe
 share/calibre/recipes/tanea.recipe
-share/calibre/recipes/tanjug.recipe
 share/calibre/recipes/tanuki.recipe
 share/calibre/recipes/tawernarpg_pl.recipe
 share/calibre/recipes/taz.recipe
@@ -3633,4 +3619,3 @@ share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
-@pkgdir lib/calibre/calibre/plugins/.libs
diff --git a/calibre3/distinfo b/calibre3/distinfo
index 28ca06b8dd..3623e4a048 100644
--- a/calibre3/distinfo
+++ b/calibre3/distinfo
@@ -4,6 +4,6 @@ SHA1 (calibre-3.16.0.tar.xz) = 22fe843c3e06071cd2e65c4e10cba070924890e5
 RMD160 (calibre-3.16.0.tar.xz) = a13f29ee8601d80f4d97563979ace1511e153077
 SHA512 (calibre-3.16.0.tar.xz) = a5208e1e781d71265bcb10757c5cb51afaa8fa89331ef075bfe8451efc8d5e2a1e70704423440cddf90c6e70e074dc9d296a7df5347639a5f7b7f1a81697e96b
 Size (calibre-3.16.0.tar.xz) = 38121688 bytes
-SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
+SHA1 (patch-setup_build.py) = 32fbf44ce795d3e1397920c669c13be976877f4a
 SHA1 (patch-setup_build__environment.py) = 8973ede2128cea065860dcc210c45f5f688a93be
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
diff --git a/calibre3/patches/patch-setup_build.py b/calibre3/patches/patch-setup_build.py
index e7122a64d3..c8c14497ba 100644
--- a/calibre3/patches/patch-setup_build.py
+++ b/calibre3/patches/patch-setup_build.py
@@ -21,12 +21,3 @@ Fix linking against native X.
          win32 {{
              LIBS += {py_lib}
              TARGET_EXT = .dll
-@@ -456,7 +458,7 @@ class Build(Command):
-         if iswindows:
-             qmc += ['-spec', qmakespec]
-         fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
--        name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
-+        name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
-         try:
-             os.chdir(src_dir)
-             if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):
Home | Main Index | Thread Index | Old Index