Fix runtime_packages on Ubuntu 18.04

rstudio · Aug 19, 2023 · ade2472 · ade2472
1 parent fec67b3
commit ade2472
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 2 deletions.
diff --git a/rules/hiredis.json b/rules/hiredis.json
@@ -1,9 +1,34 @@
 {
   "patterns": ["\\bhiredis\\b"],
   "dependencies": [
+    {
+      "packages": ["libhiredis-dev"],
+      "runtime_packages": ["libhiredis0.13"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "ubuntu",
+          "versions": ["18.04"]
+        }
+      ]
+    },
     {
       "packages": ["libhiredis-dev"],
       "runtime_packages": ["libhiredis0.14"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "ubuntu",
+          "versions": ["20.04", "22.04"]
+        },
+        {
+          "os": "linux",
+          "distribution": "debian"
+        }
+      ]
+    },
+    {
+      "packages": ["libhiredis-dev"],
       "constraints": [
         {
           "os": "linux",

diff --git a/rules/libavfilter.json b/rules/libavfilter.json
@@ -1,13 +1,25 @@
 {
   "patterns": ["\\blibavfilter\\b"],
   "dependencies": [
+    {
+      "packages": ["libavfilter-dev"],
+      "runtime_packages": ["libavfilter6"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "ubuntu",
+          "versions": ["18.04"]
+        }
+      ]
+    },
     {
       "packages": ["libavfilter-dev"],
       "runtime_packages": ["libavfilter7"],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "ubuntu"
+          "distribution": "ubuntu",
+          "versions": ["20.04", "22.04"]
         },
         {
           "os": "linux",

diff --git a/rules/libmysqlclient.json b/rules/libmysqlclient.json
@@ -1,13 +1,25 @@
 {
   "patterns": ["\\blibmysqlclient\\b"],
   "dependencies": [
+    {
+      "packages": ["libmysqlclient-dev"],
+      "runtime_packages": ["libmysqlclient20"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "ubuntu",
+          "versions": ["18.04"]
+        }
+      ]
+    },
     {
       "packages": ["libmysqlclient-dev"],
       "runtime_packages": ["libmysqlclient21"],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "ubuntu"
+          "distribution": "ubuntu",
+          "versions": ["20.04", "22.04"]
         }
       ]
     },

diff --git a/rules/pango.json b/rules/pango.json
@@ -11,6 +11,20 @@
           "libpangoxft-1.0-0",
           "pango1.0-tools"
         ],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "ubuntu",
+            "versions": ["20.04", "22.04"]
+          },
+          {
+            "os": "linux",
+            "distribution": "debian"
+          }
+        ]
+      },
+      {
+        "packages": ["libpango1.0-dev"],
         "constraints": [
           {
             "os": "linux",