This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 11/14] Drop in SolvableVersion as a replacement for packageversion
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Wed, 31 May 2017 12:05:06 +0100
- Subject: [PATCH setup 11/14] Drop in SolvableVersion as a replacement for packageversion
- Authentication-results: sourceware.org; auth=none
- References: <20170531105015.162228-1-jon.turney@dronecode.org.uk>
---
Makefile.am | 1 +
PackageSpecification.h | 4 +++-
package_db.cc | 1 +
package_meta.h | 3 ++-
package_version.h | 21 +++++++++++++++++++++
5 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 package_version.h
diff --git a/Makefile.am b/Makefile.am
index 7ea9d89..7fe4b2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,6 +208,7 @@ inilint_SOURCES = \
package_meta.h \
package_source.cc \
package_source.h \
+ package_version.h \
PackageSpecification.cc \
PackageSpecification.h \
PackageTrust.h \
diff --git a/PackageSpecification.h b/PackageSpecification.h
index ef992fa..0706ec8 100644
--- a/PackageSpecification.h
+++ b/PackageSpecification.h
@@ -18,7 +18,9 @@
#include <iosfwd>
#include "String++.h"
-class packageversion;
+
+class SolvableVersion;
+typedef SolvableVersion packageversion;
/* Describe a package - i.e. we need version 5 of apt */
diff --git a/package_db.cc b/package_db.cc
index ae71900..123e4f3 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -31,6 +31,7 @@
#include "compress.h"
#include "filemanip.h"
+#include "package_version.h"
#include "package_db.h"
#include "package_meta.h"
#include "Exception.h"
diff --git a/package_meta.h b/package_meta.h
index 421646a..b6faab8 100644
--- a/package_meta.h
+++ b/package_meta.h
@@ -16,7 +16,8 @@
#ifndef SETUP_PACKAGE_META_H
#define SETUP_PACKAGE_META_H
-class packageversion;
+class SolvableVersion;
+typedef SolvableVersion packageversion;
class packagemeta;
#include <set>
diff --git a/package_version.h b/package_version.h
new file mode 100644
index 0000000..43cf146
--- /dev/null
+++ b/package_version.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2017 Jon Turney
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * A copy of the GNU General Public License can be found at
+ * http://www.gnu.org/
+ *
+ */
+
+#ifndef PACKAGE_VERSION_H
+#define PACKAGE_VERSION_H
+
+#include "libsolv.h"
+
+typedef SolvableVersion packageversion;
+
+#endif // PACKAGE_VERSION_H
--
2.12.3