From 247723eacab116d8d13c0a4f98ab685f61259319 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 10 Nov 2010 14:28:42 -0700
Subject: [PATCH] Rolling Stone by DM. Fix #7490 (New recipe for US edition of
 Rolling Stone Magazine - free content)

---
 resources/images/news/rollingstone.png | Bin 0 -> 1318 bytes
 resources/recipes/rollingstone.recipe  |  69 +++++++++++++++++++++++++
 setup/extensions.py                    |   6 ++-
 setup/installer/windows/freeze.py      |   2 +-
 4 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 resources/images/news/rollingstone.png
 create mode 100644 resources/recipes/rollingstone.recipe

diff --git a/resources/images/news/rollingstone.png b/resources/images/news/rollingstone.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f847d1dad0d0dc4c13942aa901c250352ae4f39
GIT binary patch
literal 1318
zcmV+>1=;$EP)<h;3K|Lk000e1NJLTq000mG000mW1^@s6Ph%q@00006VoOIv|NsC0
z|NjYC_uK#g010qNS#tmY07w7;07w8v$!k6U000Sga6xAP000mG000mGT*j@#000C}
zNkl<ZNXLCuJ8u(96#iz$juULJp@@*;R{}){Rz!mU0WFwE7jOh^LT)5F5YVB}MnVZ7
z(L^{vM?w1J4;Tp~8l3QmjgYWIkN|tVV2Hgl=N5;#n|qP&H1_VCJ+JRO-x1YnDwWL=
zX)T15fKo&NKtx0Y5D6g!pp+0qfYwC(%ys}^4B-2~b~^x&GPt*IeP2qBV~mtQ$Qp)1
z#u&o^0f57@Qy~B;W3gxyh(tz5M@NGILU3?<d><eJy4`a5?OVVY&vRY2wTVc{Hd|Z2
z6X1%4Fa`kP@&0~b*RE^VE?)+s(R@Ci2b6Lg#{raz#~p{i!2cfh_w#3|^x_5Z>C@EI
zUw;8WtL1qdFB}F?sU(wwgG7}|GMUK`wcE?fD=S3ZE|D=rt~)<}=MGV&GBB`b50Tcc
z>v;^2)<mwmva-BPRIR2`=`>NTRw!J&NMua2*=Vp2BBFM?R4SE--n~nw_wFTn|2~<_
zW{IQ_+-&;`I8HncNNK^~-*7mSNv8oJ948hFAn^UQwKs1VX(52Ety1avbD-6F`gCcD
zAp(HDz9UBtA7%(F)KUT=OEw{ZPzc!Eyn6M<4Iq&?efq=+z;&NISy}>mdvm$rVYXuj
z?D*HOa(Q)?(-DHn+wF28J9h?l7JFN$F@V-UNJ?g<@AHS@aILnn0et<su<-C<K%PkC
z*s-HWw<F9Bjj7e@b?yKW5RYHDFg^|>5{1IKbDR(WG#ZZ{6^m?Vj3qu0@_l|Ggss3B
ztvOT9m?#_uB9UBf|NcLz<~S1*lao9h!^1!%GBT3O1^1p;EEbDEvpGM1_bvxk3eZ~0
zP6r6tmMFy-{+GpC|87-iU?7<cu-Cd?|L_4&Dv^lCIq=9xF!$fS&CT7r2Q-^=bNBB9
z#z@J~usTS|9hA1k-7ZUorJgaCd_YeR(9@I4ZLh4|e)jC;OW^b8OP8jn0j*oDR*Ny0
zk~_9<A3ytk5YTeY7=}PvJi=j%maUQ#>ghRj=-@%CjRC1Toz>OXuUQ$10MA=oeEc}D
z+p!~`KXnRFDw9bj`K{JKIBbkktfa;OQV71VEVd5qiAIkf=kXDOxxu%cPOVm}1*~o~
z78Vv40U<oE)e5Gizkg<CW+t$+Qv8qbRjaAg&=Ar3dODrW64mP`Po6zX)NYr{uU-X0
zVhjt9*7m>ax-QYjkNNzWGb}7aLqzrZ#KiP8{c$!ouUxr)JrE)*T%uCRWCjO09~LAQ
zn%>@A?!bZV`c9<O_D*nxKYo<UYioc~p7;Gb+bRXb<AuW57_fWy?c1}nmUcj^_25CV
z2z>c+>(=ZnAnY~_b^=2o1kZJ_&4l3bu{7nQlob{RQV3?d*4*kuVr*=DoT0dR6A&Vi
z=<5S~zh2+i0L1z_Lm<Sz*RNfr_SkV`0&!ASkhBgGm(rL}2+&%HZr848US_cvkVs5T
zO-=%_*!lB?0`NCCgS=%A-tXi9001R)MObuXVRU6WV{&C-bY%cCFflMKF)=MMFjO%#
zIx;spFgGnQH##sdCUxWB0000bbVXQnWMOn=I&E)cX=Zr<GB7bPEio}IF)&myHaamk
cIx{jYFgH3dFmfTFQUCw|07*qoM6N<$f-yo!RsaA1

literal 0
HcmV?d00001

diff --git a/resources/recipes/rollingstone.recipe b/resources/recipes/rollingstone.recipe
new file mode 100644
index 0000000000..a980219e26
--- /dev/null
+++ b/resources/recipes/rollingstone.recipe
@@ -0,0 +1,69 @@
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+rollingstone.com
+'''
+
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class RollingStone(BasicNewsRecipe):
+    title                 = 'Rolling Stone Magazine - free content'
+    __author__            = 'Darko Miletic'
+    description           = 'Rolling Stone Magazine features music, album and artist news, movie reviews, political, economic and pop culture commentary, videos, photos, and more.'
+    publisher             = 'Werner Media inc.'
+    category              = 'news, music, USA, world'
+    oldest_article        = 15
+    max_articles_per_feed = 200
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = False
+    language              = 'en'
+    remove_empty_feeds    = True
+    publication_type      = 'magazine'
+    masthead_url          = 'http://www.rollingstone.com/templates/rolling-stone-templates/theme/rstheme/images/rsLogo.png'
+    extra_css             = """
+                               body{font-family: Georgia,Times,serif }
+                               img{margin-bottom: 0.4em; display:block}
+                            """
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    preprocess_regexps = [
+                          (re.compile(r'xml:lang="en">.*?<head>', re.DOTALL|re.IGNORECASE),lambda match: 'xml:lang="en">\n<head>\n')
+                         ,(re.compile(r'</title>.*?</head>'     , re.DOTALL|re.IGNORECASE),lambda match: '</title>\n</head>\n'     )
+                         ]
+
+    keep_only_tags=[
+                     dict(attrs={'class':['headerImgHolder','headerContent']})
+                    ,dict(name='div',attrs={'id':['teaser','storyTextContainer']})
+                    ,dict(name='div',attrs={'class':'blogDetailModule clearfix'})
+                   ]
+
+    remove_tags = [
+                      dict(name=['meta','iframe','object','embed'])
+                     ,dict(attrs={'id':'mpStoryHeader'})
+                     ,dict(attrs={'class':'relatedTopics'})
+                  ]
+    remove_attributes=['lang','onclick','width','height','name']
+    remove_tags_before=dict(attrs={'class':'bloggerInfo'})
+    remove_tags_after=dict(attrs={'class':'relatedTopics'})
+
+
+    feeds = [
+              (u'All News'      , u'http://www.rollingstone.com/siteServices/rss/allNews'      )
+             ,(u'All Blogs'     , u'http://www.rollingstone.com/siteServices/rss/allBlogs'     )
+             ,(u'Movie Reviews' , u'http://www.rollingstone.com/siteServices/rss/movieReviews' )
+             ,(u'Album Reviews' , u'http://www.rollingstone.com/siteServices/rss/albumReviews' )
+             ,(u'Song Reviews'  , u'http://www.rollingstone.com/siteServices/rss/songReviews'  )
+            ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/setup/extensions.py b/setup/extensions.py
index 893ce1be39..531107d3cb 100644
--- a/setup/extensions.py
+++ b/setup/extensions.py
@@ -350,8 +350,10 @@ class Build(Command):
             ''')%(ext.name, ' '.join(ext.headers), ' '.join(ext.sources), archs)
             pro = pro.replace('\\', '\\\\')
             open(ext.name+'.pro', 'wb').write(pro)
-            subprocess.check_call([QMAKE, '-o', 'Makefile', '-spec',
-                'win32-msvc2008', ext.name+'.pro'])
+            qmc = [QMAKE, '-o', 'Makefile']
+            if iswindows:
+                qmc += ['-spec', 'win32-msvc2008']
+            subprocess.check_call(qmc + [ext.name+'.pro'])
             subprocess.check_call([make, '-f', 'Makefile'])
             objects = glob.glob(obj_pat)
         return list(map(self.a, objects))
diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index 35fe78b13b..dc3dd33604 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -13,7 +13,7 @@ from setup import Command, modules, functions, basenames, __version__, \
 from setup.build_environment import msvc, MT, RC
 from setup.installer.windows.wix import WixMixIn
 
-QT_DIR = 'Q:\\Qt\\4.7.0'
+QT_DIR = 'Q:\\Qt\\4.7.1'
 QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'