15:01 Tobias Kortkamp (tobik) 

*: Clean up some things

- Fix typos
- Fix overwritten variables with focus on master/slave ports
- Remove unreferenced variables
- Sort categories
- Remove redundant option descriptions
- Clean up commented PORTREVISION
- Add missing USES

Reported by:	portscan

    ae22a78

08:09 Mathieu Arnold (mat) 

One more small cleanup, forgotten yesterday.
Reported by:	lwhsu

    cf118cc

14:31 Mathieu Arnold (mat) 

Remove # $FreeBSD$ from Makefiles.

    305f148

22:44 jhale 

security/*gpgme*: Update to 1.15.1

 

02:29 jhale 

security/gpgme-cpp: Fix constness

The 1.15.0 release of gpgme-cpp adds a `Signature::operator<` which is missing
a const. In 6a6d2a27648, Signature got an operator< . This is used in
*security/libkleo*, for instance, to sort the signatures for display.

The build failure looks like this (trimmed for brevity, on 13-):

===
/usr/include/c++/v1/algorithm:715:71: error: invalid operands to binary
expression ('const GpgME::UserID::Signature' and 'const
GpgME::UserID::Signature')
    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}

/wrkdirs/usr/ports/security/libkleo/work/libkleo-20.12.0/src/models/
useridlistmodel.cpp:203:14: note: in instantiation of function template
specialization 'std::__1::sort<GpgME::UserID::Signature>' requested here
        std::sort(sigs.begin(), sigs.end());
===

PR:		252283
Submitted by:	adridg

 

23:41 jhale 

Update security/gpgme-* to 1.8.0

In this version, libgpgme-pthread.so has been removed in favor of just
using libgpgme.so as the thread-safe library. PORTREVISION has been
bumped on all ports depending on security/gpgme so that any that may have
linked to -lgpgme-pthread will link to -lgpgme instead.

The Python module provided by security/py-gpgme has been renamed upstream
from pyme3 to gpg. This removes the conflict with security/py-pyme,
although security/py-gpgme is still the direct replacement of that
module.

 

13:55 jhale 

Using ports libc++ on non-leaf ports is problematic, as the requirement
basically flows to all ports that depend on gpgme-{cpp,qt5}. In particular,
sysutils/kf5-kwallet was breaking in FreeBSD 9.x because mismatches between
libc++ and libstdc++ from gcc48 were causing a gpgme symbol not to be found:

backendpersisthandler.cpp:(.text+0xf61): undefined reference to
`GpgME::Context::encrypt(std::vector<GpgME::Key, std::allocator<GpgME::Key> >
const&, GpgME::Data const&, GpgME::Data&, GpgME::Context::EncryptionFlags)'

Switch the build of both ports to lang/gcc on FreeBSD 9 and the system compiler
on FreeBSD 10:
* Use USES:compiler-c++11-lib instead of compiler-c++11-lang, as we do need a
C++11-compatible standard library. This causes the right compiler to be chosen
as described above.
* Set _GLIBCXX_USE_C99 so that gpgme-cpp builds with GCC 4.8 (std::to_string()
is not exposed by default on FreeBSD). Several other ports need to do the same.
* Add a few patches to fix the gpgme-qt5:
** patch-git_b4658f6a1 is a backport from an upstream commit to make the port
   build with GCC 4.8 without errors.
** patch-lang_qt_src_qgpgmeencryptjob.cpp is a local workaround for the
   std::bind() bug mentioned in ports r424451.

PR:		214575
Submitted by:	rakuco

 

19:45 jhale 

- Update security/gpgme to 1.7.0
- Convert to master port and add several slave ports for the newly added
  c++, Qt5, and python bindings (security/gpgme-cpp, security/gpgme-qt5,
  and security/py-gpgme, respectively)
- The Qt bindings currently provided by deskutils/kdepimlibs4
  cannot currently coexist with these new bindings, but will be phased out
  in the future
- The python bindings are an updated version of the ones provided by
  security/py-pyme and are now being maintained as part of the gpgme project.
  They work with both python 2.x and 3.x.

PR:		212886