Merge lp://qastaging/~tintou/pantheon-photos/first-cmake into lp://qastaging/~pantheon-photos/pantheon-photos/trunk

Proposed by Corentin Noël
Status: Merged
Approved by: Cody Garver
Approved revision: 2882
Merged at revision: 2881
Proposed branch: lp://qastaging/~tintou/pantheon-photos/first-cmake
Merge into: lp://qastaging/~pantheon-photos/pantheon-photos/trunk
Diff against target: 14451 lines (+4477/-8379)
266 files modified
.doap (+0/-21)
.gitignore (+0/-23)
CMakeLists.txt (+111/-0)
Makefile (+0/-697)
apport/shotwell.py (+0/-7)
chkver (+0/-119)
cmake/FindGirCompiler.cmake (+56/-0)
cmake/FindVala.cmake (+65/-0)
cmake/GObjectIntrospectionMacros.cmake (+34/-0)
cmake/GResource.cmake (+67/-0)
cmake/GSettings.cmake (+42/-0)
cmake/Tests.cmake (+5/-0)
cmake/Translations.cmake (+203/-0)
cmake/Uninstall.cmake (+25/-0)
cmake/ValaPrecompile.cmake (+251/-0)
cmake/ValaVersion.cmake (+96/-0)
configure (+0/-184)
data/CMakeLists.txt (+19/-0)
data/pantheon-photos-viewer.desktop.in.in (+9/-7)
data/pantheon-photos.appdata.xml.in (+21/-15)
data/pantheon-photos.desktop.in.in (+10/-10)
help/C/Makefile (+0/-35)
help/C/edit-adjustments.page (+0/-51)
help/C/edit-crop.page (+0/-46)
help/C/edit-enhance.page (+0/-17)
help/C/edit-external.page (+0/-54)
help/C/edit-nondestructive.page (+0/-22)
help/C/edit-redeye.page (+0/-26)
help/C/edit-rotate.page (+0/-27)
help/C/edit-straighten.page (+0/-28)
help/C/edit-time-date.page (+0/-21)
help/C/edit-undo.page (+0/-22)
help/C/formats.page (+0/-35)
help/C/import-camera.page (+0/-33)
help/C/import-f-spot.page (+0/-22)
help/C/import-file.page (+0/-24)
help/C/import-memorycard.page (+0/-32)
help/C/index.page (+0/-48)
help/C/organize-event.page (+0/-60)
help/C/organize-flag.page (+0/-35)
help/C/organize-rating.page (+0/-30)
help/C/organize-remove.page (+0/-45)
help/C/organize-search.page (+0/-63)
help/C/organize-tag.page (+0/-94)
help/C/organize-title.page (+0/-20)
help/C/other-files.page (+0/-146)
help/C/other-missing.page (+0/-23)
help/C/other-multiple.page (+0/-23)
help/C/other-plugins.page (+0/-29)
help/C/raw.page (+0/-46)
help/C/running.page (+0/-29)
help/C/share-background.page (+0/-23)
help/C/share-export.page (+0/-45)
help/C/share-print.page (+0/-24)
help/C/share-send.page (+0/-25)
help/C/share-slideshow.page (+0/-23)
help/C/share-upload.page (+0/-38)
help/C/view-displaying.page (+0/-28)
help/C/view-information.page (+0/-19)
help/C/view-sidebar.page (+0/-36)
help/Makefile.am (+0/-46)
help/es/es.po (+0/-2192)
misc/pantheon-photos-viewer.desktop.tail (+0/-3)
misc/pantheon-photos.convert (+0/-104)
misc/pantheon-photos.desktop.tail (+0/-3)
mkunit (+0/-20)
mkvala (+0/-20)
plugins/CMakeLists.txt (+11/-0)
plugins/common/RESTSupport.vala (+0/-1162)
plugins/common/Resources.vala (+0/-54)
plugins/common/SqliteSupport.vala (+0/-76)
plugins/common/VersionNumber.vala (+0/-50)
plugins/pantheon-photos-publishing-extras/CMakeLists.txt (+32/-0)
plugins/pantheon-photos-publishing-extras/RESTSupport.vala (+1165/-0)
plugins/pantheon-photos-publishing-extras/Resources.vala (+54/-0)
plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala (+3/-0)
plugins/pantheon-photos-publishing-extras/YandexPublishing.vala (+22/-11)
plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala (+0/-2)
plugins/pantheon-photos-publishing/CMakeLists.txt (+35/-0)
plugins/pantheon-photos-publishing/FacebookPublishing.vala (+12/-9)
plugins/pantheon-photos-publishing/PiwigoPublishing.vala (+3/-0)
plugins/pantheon-photos-publishing/RESTSupport.vala (+1165/-0)
plugins/pantheon-photos-publishing/Resources.vala (+54/-0)
plugins/pantheon-photos-publishing/shotwell-publishing.vala (+0/-2)
plugins/pantheon-photos-transitions/CMakeLists.txt (+32/-0)
plugins/pantheon-photos-transitions/Resources.vala (+54/-0)
plugins/pantheon-photos-transitions/shotwell-transitions.vala (+0/-2)
plugins/shotwell-publishing-extras/Makefile (+0/-27)
plugins/shotwell-publishing/Makefile (+0/-39)
plugins/shotwell-transitions/Makefile (+0/-21)
po/CMakeLists.txt (+10/-0)
po/LINGUAS (+0/-61)
po/POTFILES.in (+0/-198)
po/aa.po (+4/-0)
po/ab.po (+4/-0)
po/ae.po (+4/-0)
po/ak.po (+4/-0)
po/am.po (+4/-0)
po/an.po (+4/-0)
po/av.po (+4/-0)
po/ay.po (+4/-0)
po/az.po (+4/-0)
po/ba.po (+4/-0)
po/be.po (+5/-0)
po/bh.po (+4/-0)
po/bi.po (+4/-0)
po/bm.po (+4/-0)
po/bo.po (+4/-0)
po/br.po (+4/-0)
po/ce.po (+4/-0)
po/ch.po (+4/-0)
po/ckb.po (+4/-0)
po/co.po (+4/-0)
po/cr.po (+4/-0)
po/cu.po (+4/-0)
po/cv.po (+4/-0)
po/cy.po (+4/-0)
po/dv.po (+4/-0)
po/dz.po (+4/-0)
po/ee.po (+4/-0)
po/en_AU.po (+4/-0)
po/en_CA.po (+4/-0)
po/fa.po (+4/-0)
po/ff.po (+4/-0)
po/fj.po (+4/-0)
po/fo.po (+5/-0)
po/fy.po (+4/-0)
po/ga.po (+4/-0)
po/gd.po (+4/-0)
po/gn.po (+4/-0)
po/gv.po (+4/-0)
po/ha.po (+4/-0)
po/ho.po (+4/-0)
po/ht.po (+4/-0)
po/hy.po (+4/-0)
po/hz.po (+4/-0)
po/ie.po (+4/-0)
po/ig.po (+4/-0)
po/ii.po (+4/-0)
po/ik.po (+4/-0)
po/io.po (+4/-0)
po/is.po (+4/-0)
po/iu.po (+4/-0)
po/jv.po (+4/-0)
po/ka.po (+4/-0)
po/kg.po (+4/-0)
po/ki.po (+4/-0)
po/kj.po (+4/-0)
po/kl.po (+4/-0)
po/kr.po (+4/-0)
po/ks.po (+4/-0)
po/ku.po (+4/-0)
po/kv.po (+4/-0)
po/kw.po (+4/-0)
po/la.po (+4/-0)
po/lg.po (+4/-0)
po/li.po (+4/-0)
po/ln.po (+4/-0)
po/lo.po (+4/-0)
po/lu.po (+4/-0)
po/mg.po (+4/-0)
po/mh.po (+4/-0)
po/mi.po (+4/-0)
po/mn.po (+4/-0)
po/mo.po (+4/-0)
po/mt.po (+4/-0)
po/my.po (+4/-0)
po/na.po (+4/-0)
po/nd.po (+4/-0)
po/ne.po (+4/-0)
po/ng.po (+4/-0)
po/no.po (+5/-0)
po/nr.po (+4/-0)
po/nv.po (+4/-0)
po/ny.po (+4/-0)
po/oc.po (+4/-0)
po/oj.po (+4/-0)
po/om.po (+4/-0)
po/os.po (+4/-0)
po/pi.po (+4/-0)
po/ps.po (+4/-0)
po/qu.po (+4/-0)
po/rm.po (+4/-0)
po/rn.po (+4/-0)
po/rue.po (+4/-0)
po/rw.po (+4/-0)
po/sa.po (+4/-0)
po/sc.po (+4/-0)
po/sd.po (+4/-0)
po/se.po (+4/-0)
po/sg.po (+4/-0)
po/si.po (+4/-0)
po/sm.po (+4/-0)
po/sma.po (+4/-0)
po/sn.po (+4/-0)
po/so.po (+4/-0)
po/ss.po (+4/-0)
po/st.po (+4/-0)
po/su.po (+4/-0)
po/sw.po (+4/-0)
po/tg.po (+4/-0)
po/ti.po (+4/-0)
po/tk.po (+4/-0)
po/tl.po (+4/-0)
po/tn.po (+4/-0)
po/to.po (+4/-0)
po/ts.po (+4/-0)
po/tt.po (+4/-0)
po/tw.po (+4/-0)
po/ty.po (+4/-0)
po/ug.po (+4/-0)
po/uz.po (+4/-0)
po/ve.po (+4/-0)
po/vo.po (+4/-0)
po/wa.po (+4/-0)
po/wo.po (+4/-0)
po/xh.po (+4/-0)
po/yi.po (+4/-0)
po/yo.po (+4/-0)
po/za.po (+4/-0)
po/zh.po (+4/-0)
po/zh_HK.po (+4/-0)
po/zu.po (+4/-0)
schemas/CMakeLists.txt (+3/-0)
settings-migrator/pantheon-photos-settings-migrator (+0/-33)
shotwell-plugin-dev-1.0.m4 (+0/-11)
shotwell.doap (+0/-31)
src/AppDirs.vala (+1/-11)
src/CMakeLists.txt (+221/-0)
src/International.vala (+0/-2)
src/Resources.vala (+0/-8)
src/SortedList.vala (+1/-1)
src/TimedQueue.vala (+2/-2)
src/camera/mk/camera.mk (+0/-32)
src/config.h.cmake (+7/-0)
src/config/GSettingsEngine.vala (+0/-14)
src/config/mk/config.mk (+0/-29)
src/core/mk/core.mk (+0/-43)
src/db/DatabaseTable.vala (+1/-0)
src/db/Db.vala (+1/-251)
src/db/mk/db.mk (+0/-35)
src/direct/Direct.vala (+2/-2)
src/direct/mk/direct.mk (+0/-36)
src/editing_tools/mk/editing_tools.mk (+0/-28)
src/events/mk/events.mk (+0/-32)
src/library/Library.vala (+15/-2)
src/library/mk/library.mk (+0/-55)
src/photos/PhotoMetadata.vala (+1/-1)
src/photos/mk/photos.mk (+0/-38)
src/plugins/mk/interfaces.mk (+0/-28)
src/plugins/mk/plugins.mk (+0/-34)
src/publishing/mk/publishing.mk (+0/-31)
src/searches/mk/searches.mk (+0/-31)
src/sidebar/mk/sidebar.mk (+0/-38)
src/slideshow/mk/slideshow.mk (+0/-29)
src/tags/mk/tags.mk (+0/-32)
src/threads/mk/threads.mk (+0/-30)
src/unit/mk/unit.mk (+0/-32)
src/util/mk/util.mk (+0/-34)
sw-glade (+0/-8)
thumbnailer/CMakeLists.txt (+14/-0)
unitize.mk (+0/-29)
units.mk (+0/-33)
vapi/config.vapi (+19/-0)
vapi/webkitgtk-3.0.deps (+0/-8)
vapi/webkitgtk-3.0.vapi (+0/-653)
To merge this branch: bzr merge lp://qastaging/~tintou/pantheon-photos/first-cmake
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+282581@code.qastaging.launchpad.net

Commit message

Ported to CMake. Removed very old retro-compatibility.

To post a comment you must log in.
2881. By Corentin Noël

Reestablish Unity flag.

2882. By Corentin Noël

[Plugins] Use the right installation dir.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: