Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50552-qtpim-upgrade' into 'master'
Jb50552 qtpim upgrade

See merge request mer-core/buteo-sync-plugins-social!66
  • Loading branch information
chriadam committed Sep 25, 2020
2 parents add5e49 + 9c24d32 commit 97bea9d
Show file tree
Hide file tree
Showing 26 changed files with 1,247 additions and 3,564 deletions.
36 changes: 3 additions & 33 deletions rpm/sociald.spec
@@ -1,6 +1,6 @@
Name: sociald
Summary: Syncs device data from social services
Version: 0.2.25
Version: 0.3.0
Release: 1
License: LGPLv2
URL: https://git.sailfishos.org/mer-core/buteo-sync-plugins-social
Expand All @@ -15,14 +15,15 @@ BuildRequires: pkgconfig(libsignon-qt5)
BuildRequires: pkgconfig(accounts-qt5) >= 1.13
BuildRequires: pkgconfig(socialcache) >= 0.0.48
BuildRequires: pkgconfig(libsailfishkeyprovider)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.3.0
BuildRequires: qt5-qttools-linguist
BuildRequires: ssu-devel
Requires: buteo-syncfw-qt5-msyncd
Requires: systemd
Requires(pre): sailfish-setup
Requires(post): systemd
Obsoletes: sociald-facebook-notifications
Obsoletes: sociald-facebook-contacts

%description
A Buteo plugin which provides data synchronization with various social services.
Expand Down Expand Up @@ -66,36 +67,6 @@ done
systemctl-user try-restart msyncd.service || :


%package facebook-contacts
Summary: Provides contact synchronisation with Facebook
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
Requires: %{name} = %{version}-%{release}

%description facebook-contacts
%{summary}

%files facebook-contacts
#out-of-process-plugin form:
%{_libdir}/buteo-plugins-qt5/oopp/facebook-contacts-client
#in-process-plugin form:
#%%{_libdir}/buteo-plugins-qt5/libfacebook-contacts-client.so
%config %{_sysconfdir}/buteo/profiles/client/facebook-contacts.xml
%config %{_sysconfdir}/buteo/profiles/sync/facebook.Contacts.xml

%pre facebook-contacts
USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n")
for user in $USERS; do
USERHOME=$(getent passwd ${user} | cut -d ":" -f 6)
rm -f ${USERHOME}/.cache/msyncd/sync/client/facebook-contacts.xml || :
rm -f ${USERHOME}/.cache/msyncd/sync/facebook.Contacts.xml || :
done

%post facebook-contacts
systemctl-user try-restart msyncd.service || :


%package facebook-images
Summary: Provides image synchronisation with Facebook
Requires: %{name} = %{version}-%{release}
Expand Down Expand Up @@ -341,7 +312,6 @@ Requires: %{name} = %{version}-%{release}
%{summary}.

%files vk-posts
#%{_datadir}/translations/lipstick-jolla-home-vk_eng_en.qm
#out-of-process-plugin form:
%{_libdir}/buteo-plugins-qt5/oopp/vk-posts-client
#in-process-plugin form:
Expand Down
5 changes: 5 additions & 0 deletions src/common.pri
Expand Up @@ -43,6 +43,11 @@ contains(DEFINES, 'SOCIALD_USE_QTPIM') {
DEFINES *= USE_CONTACTS_NAMESPACE=QTCONTACTS_USE_NAMESPACE
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
HEADERS += $$PWD/common/constants_p.h

# We need the moc output for ContactManagerEngine from sqlite-extensions
extensionsIncludePath = $$system(pkg-config --cflags-only-I qtcontacts-sqlite-qt5-extensions)
VPATH += $$replace(extensionsIncludePath, -I, )
HEADERS += contactmanagerengine.h
}

# don't pull in buteo plugin framework for unit test builds
Expand Down
7 changes: 0 additions & 7 deletions src/facebook/facebook-contacts/facebook-contacts.pri

This file was deleted.

25 changes: 0 additions & 25 deletions src/facebook/facebook-contacts/facebook-contacts.pro

This file was deleted.

4 changes: 0 additions & 4 deletions src/facebook/facebook-contacts/facebook-contacts.xml

This file was deleted.

15 changes: 0 additions & 15 deletions src/facebook/facebook-contacts/facebook.Contacts.xml

This file was deleted.

58 changes: 0 additions & 58 deletions src/facebook/facebook-contacts/facebookcontactsplugin.cpp

This file was deleted.

47 changes: 0 additions & 47 deletions src/facebook/facebook-contacts/facebookcontactsplugin.h

This file was deleted.

0 comments on commit 97bea9d

Please sign in to comment.