diff options
Diffstat (limited to 'libre/minitube/remove_unfree_recommendations.patch')
| -rw-r--r-- | libre/minitube/remove_unfree_recommendations.patch | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/libre/minitube/remove_unfree_recommendations.patch b/libre/minitube/remove_unfree_recommendations.patch index 3b05f93c3..0b11b3be3 100644 --- a/libre/minitube/remove_unfree_recommendations.patch +++ b/libre/minitube/remove_unfree_recommendations.patch @@ -1,6 +1,8 @@ ---- minitube-3.3.orig/minitube.pro 2019-12-20 19:58:27.000000000 -0500 -+++ minitube-3.3/minitube.pro 2020-04-11 02:29:24.437159651 -0500 -@@ -103,7 +103,6 @@ +diff --git a/minitube.pro b/minitube.pro +index e75a41d..e3dbcb1 100644 +--- a/minitube.pro ++++ b/minitube.pro +@@ -117,7 +117,6 @@ HEADERS += src/video.h \ src/searchwidget.h \ src/channellistview.h \ src/httputils.h \ @@ -8,7 +10,7 @@ src/clickablelabel.h \ src/ytvideo.h \ src/toolbarmenu.h \ -@@ -176,7 +175,6 @@ +@@ -192,7 +191,6 @@ SOURCES += src/main.cpp \ src/paginatedvideosource.cpp \ src/channellistview.cpp \ src/httputils.cpp \ @@ -16,9 +18,11 @@ src/clickablelabel.cpp \ src/ytvideo.cpp \ src/toolbarmenu.cpp \ ---- minitube-3.3.orig/src/aboutview.cpp 2019-12-20 19:58:27.000000000 -0500 -+++ minitube-3.3/src/aboutview.cpp 2020-04-11 02:32:03.707157988 -0500 -@@ -30,7 +30,6 @@ +diff --git a/src/aboutview.cpp b/src/aboutview.cpp +index 48b7dff..19140a8 100644 +--- a/src/aboutview.cpp ++++ b/src/aboutview.cpp +@@ -30,7 +30,6 @@ $END_LICENSE */ #include "mac_startup.h" #include "macutils.h" #endif @@ -26,7 +30,7 @@ #include "clickablelabel.h" #include "fontutils.h" #include "iconutils.h" -@@ -157,8 +156,6 @@ +@@ -197,8 +196,6 @@ AboutView::AboutView(QWidget *parent) : View(parent) { buttonLayout->addWidget(closeButton); layout->addLayout(buttonLayout); @@ -35,9 +39,12 @@ } void AboutView::appear() { ---- minitube-3.3.orig/src/appwidget.cpp 2019-12-20 19:58:27.000000000 -0500 -+++ minitube-3.3/src/appwidget.cpp 1969-12-31 19:00:00.000000000 -0500 -@@ -1,112 +0,0 @@ +diff --git a/src/appwidget.cpp b/src/appwidget.cpp +deleted file mode 100644 +index 3c67e28..0000000 +--- a/src/appwidget.cpp ++++ /dev/null +@@ -1,120 +0,0 @@ -#include "appwidget.h" -#include "constants.h" -#include "http.h" @@ -61,6 +68,9 @@ - const QString ext = "deb"; -#endif - +-#ifdef APP_MAC +- setupApp("Sofa", "sofa." + ext); +-#endif - setupApp("Finetune", "finetune." + ext); - setupApp("Musictube", "musictube." + ext); - setupApp("Musique", "musique." + ext); @@ -79,7 +89,8 @@ - style()->drawPrimitive(QStyle::PE_Widget, &o, &p, this); -} - --AppWidget::AppWidget(const QString &name, const QString &code, QWidget *parent) : QWidget(parent), icon(0), name(name), downloadButton(0) { +-AppWidget::AppWidget(const QString &name, const QString &code, QWidget *parent) +- : QWidget(parent), name(name), downloadButton(nullptr) { - const QString unixName = code.left(code.lastIndexOf('.')); - const QString baseUrl = QLatin1String("https://") + Constants::ORG_DOMAIN; - const QString filesUrl = baseUrl + QLatin1String("/files/"); @@ -93,7 +104,11 @@ - icon = new QLabel(); - icon->setMinimumHeight(128); - layout->addWidget(icon); -- const QString iconUrl = filesUrl + QLatin1String("products/") + unixName + QLatin1String(".png"); +- QString pixelRatioString; +- if (devicePixelRatioF() > 1.0) +- pixelRatioString = '@' + QString::number(devicePixelRatio()) + 'x'; +- const QString iconUrl = filesUrl + QLatin1String("products/") + unixName + pixelRatioString + +- QLatin1String(".png"); - QObject *reply = Http::instance().get(iconUrl); - connect(reply, SIGNAL(data(QByteArray)), SLOT(iconDownloaded(QByteArray))); - @@ -150,8 +165,11 @@ - dialog->show(); -#endif -} ---- minitube-3.3.orig/src/appwidget.h 2019-12-20 19:58:27.000000000 -0500 -+++ minitube-3.3/src/appwidget.h 1969-12-31 19:00:00.000000000 -0500 +diff --git a/src/appwidget.h b/src/appwidget.h +deleted file mode 100644 +index a5ee272..0000000 +--- a/src/appwidget.h ++++ /dev/null @@ -1,46 +0,0 @@ -#ifndef APPWIDGET_H -#define APPWIDGET_H |