added my Recipes
This commit is contained in:
@@ -0,0 +1,89 @@
|
||||
From eb0086dc4ea8fe9cda069456287b3a29a2631d30 Mon Sep 17 00:00:00 2001
|
||||
From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
|
||||
Date: Wed, 13 Dec 2017 16:18:45 +0900
|
||||
Subject: [PATCH] Fix the error of can't find header file
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
This fix is just for yocto.
|
||||
|
||||
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
|
||||
---
|
||||
src/NCApplication.cc | 2 +-
|
||||
src/NCstyle.h | 2 +-
|
||||
src/NCurses.h | 2 +-
|
||||
src/ncursesp.h | 2 +-
|
||||
src/ncursesw.cc | 2 +-
|
||||
src/ncursesw.h | 4 ++--
|
||||
6 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/src/NCApplication.cc
|
||||
+++ b/src/NCApplication.cc
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
/-*/
|
||||
|
||||
-#include <ncursesw/curses.h>
|
||||
+#include <curses.h>
|
||||
|
||||
#define YUILogComponent "ncurses"
|
||||
#include <yui/YUILog.h>
|
||||
--- a/src/NCstyle.h
|
||||
+++ b/src/NCstyle.h
|
||||
@@ -25,7 +25,7 @@
|
||||
#ifndef NCstyle_h
|
||||
#define NCstyle_h
|
||||
|
||||
-#include <ncursesw/ncurses.h>
|
||||
+#include <ncurses.h>
|
||||
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
--- a/src/NCurses.h
|
||||
+++ b/src/NCurses.h
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <yui/YWidget.h>
|
||||
#include <yui/YMenuItem.h>
|
||||
|
||||
-#include <ncursesw/curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */
|
||||
+#include <curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */
|
||||
#include <wchar.h>
|
||||
|
||||
#include "ncursesw.h"
|
||||
--- a/src/ncursesp.h
|
||||
+++ b/src/ncursesp.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <iosfwd>
|
||||
|
||||
#include "ncursesw.h"
|
||||
-#include <ncursesw/panel.h>
|
||||
+#include <panel.h>
|
||||
|
||||
class NCursesPanel : public NCursesWindow
|
||||
{
|
||||
--- a/src/ncursesw.cc
|
||||
+++ b/src/ncursesw.cc
|
||||
@@ -47,7 +47,7 @@
|
||||
#include <iostream>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <ncursesw/term.h>
|
||||
+#include <term.h>
|
||||
#undef line
|
||||
#undef columns
|
||||
|
||||
--- a/src/ncursesw.h
|
||||
+++ b/src/ncursesw.h
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
-#include <ncursesw/curses.h>
|
||||
+#include <curses.h>
|
||||
#ifndef NCURSES_CXX_IMPEXP
|
||||
#define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_IMPORT
|
||||
#endif
|
||||
-#include <ncursesw/etip.h>
|
||||
+#include <etip.h>
|
||||
#include <cstdio>
|
||||
#include <cstdarg>
|
||||
#include <climits>
|
||||
@@ -0,0 +1,176 @@
|
||||
From b81fb7942ab77b0bf6791e5fd98411dd68f133d9 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 18 Dec 2022 15:13:00 -0800
|
||||
Subject: [PATCH] libyui-ncurses: Replace off64_t with off_t and stat64 with stat
|
||||
|
||||
stat is same as stat64 when 64bit off_t is used.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/88]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/NCAskForFile.cc | 6 +++---
|
||||
src/NCFileSelection.cc | 24 ++++++++++++------------
|
||||
src/NCFileSelection.h | 6 +++---
|
||||
4 files changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/libyui-ncurses/CMakeLists.txt
|
||||
index b10eab8e..2000bb58 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -58,7 +58,7 @@ set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make
|
||||
# Initialize compiler flags for all targets in all subdirectories
|
||||
add_compile_options( "-Wall" )
|
||||
add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds)
|
||||
-
|
||||
+add_compile_options( "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ) # Enable largefile support
|
||||
if ( WERROR )
|
||||
add_compile_options( "-Werror" )
|
||||
endif()
|
||||
diff --git a/src/NCAskForFile.cc b/libyui-ncurses/src/NCAskForFile.cc
|
||||
index aba6e0a6..44bb81bc 100644
|
||||
--- a/src/NCAskForFile.cc
|
||||
+++ b/src/NCAskForFile.cc
|
||||
@@ -73,8 +73,8 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
|
||||
{
|
||||
std::string dname = "";
|
||||
|
||||
- struct stat64 statInfo;
|
||||
- stat64( iniDir.c_str(), &statInfo );
|
||||
+ struct stat statInfo;
|
||||
+ stat( iniDir.c_str(), &statInfo );
|
||||
|
||||
if ( S_ISDIR( statInfo.st_mode ) )
|
||||
{
|
||||
@@ -90,7 +90,7 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
|
||||
&& pos != 0 )
|
||||
{
|
||||
std::string dir = iniDir.substr( 0, pos );
|
||||
- stat64( dir.c_str(), &statInfo );
|
||||
+ stat( dir.c_str(), &statInfo );
|
||||
|
||||
if ( S_ISDIR( statInfo.st_mode ) )
|
||||
{
|
||||
diff --git a/src/NCFileSelection.cc b/libyui-ncurses/src/NCFileSelection.cc
|
||||
index 3eb9c908..8894dc72 100644
|
||||
--- a/src/NCFileSelection.cc
|
||||
+++ b/src/NCFileSelection.cc
|
||||
@@ -46,7 +46,7 @@ using std::list;
|
||||
|
||||
|
||||
NCFileInfo::NCFileInfo( string fileName,
|
||||
- struct stat64 * statInfo,
|
||||
+ struct stat * statInfo,
|
||||
bool link )
|
||||
{
|
||||
_name = fileName;
|
||||
@@ -146,7 +146,7 @@ NCFileInfo::NCFileInfo()
|
||||
_mode = ( mode_t )0;
|
||||
_device = ( dev_t )0;
|
||||
_links = ( nlink_t )0;
|
||||
- _size = ( off64_t )0;
|
||||
+ _size = ( off_t )0;
|
||||
_mtime = ( time_t )0;
|
||||
}
|
||||
|
||||
@@ -177,11 +177,11 @@ NCFileSelection::NCFileSelection( YWidget * parent,
|
||||
{
|
||||
SetSepChar( ' ' );
|
||||
|
||||
- struct stat64 statInfo;
|
||||
+ struct stat statInfo;
|
||||
|
||||
if ( !iniDir.empty() )
|
||||
{
|
||||
- stat64( iniDir.c_str(), &statInfo );
|
||||
+ stat( iniDir.c_str(), &statInfo );
|
||||
}
|
||||
|
||||
if ( iniDir.empty()
|
||||
@@ -559,8 +559,8 @@ NCursesEvent NCFileTable::wHandleInput( wint_t key )
|
||||
bool NCFileTable::fillList()
|
||||
{
|
||||
|
||||
- struct stat64 statInfo;
|
||||
- struct stat64 linkInfo;
|
||||
+ struct stat statInfo;
|
||||
+ struct stat linkInfo;
|
||||
struct dirent * entry;
|
||||
list<string> tmpList;
|
||||
list<string>::iterator it;
|
||||
@@ -592,7 +592,7 @@ bool NCFileTable::fillList()
|
||||
{
|
||||
string fullName = currentDir + "/" + ( *it );
|
||||
|
||||
- if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
|
||||
+ if ( lstat( fullName.c_str(), &statInfo ) == 0 )
|
||||
{
|
||||
if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) )
|
||||
{
|
||||
@@ -604,7 +604,7 @@ bool NCFileTable::fillList()
|
||||
}
|
||||
else if ( S_ISLNK( statInfo.st_mode ) )
|
||||
{
|
||||
- if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
|
||||
+ if ( stat( fullName.c_str(), &linkInfo ) == 0 )
|
||||
{
|
||||
if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) )
|
||||
{
|
||||
@@ -701,8 +701,8 @@ void NCDirectoryTable::fillHeader()
|
||||
|
||||
bool NCDirectoryTable::fillList()
|
||||
{
|
||||
- struct stat64 statInfo;
|
||||
- struct stat64 linkInfo;
|
||||
+ struct stat statInfo;
|
||||
+ struct stat linkInfo;
|
||||
struct dirent * entry;
|
||||
list<string> tmpList;
|
||||
list<string>::iterator it;
|
||||
@@ -734,7 +734,7 @@ bool NCDirectoryTable::fillList()
|
||||
{
|
||||
string fullName = currentDir + "/" + ( *it );
|
||||
|
||||
- if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
|
||||
+ if ( lstat( fullName.c_str(), &statInfo ) == 0 )
|
||||
{
|
||||
if ( S_ISDIR( statInfo.st_mode ) )
|
||||
{
|
||||
@@ -746,7 +746,7 @@ bool NCDirectoryTable::fillList()
|
||||
}
|
||||
else if ( S_ISLNK( statInfo.st_mode ) )
|
||||
{
|
||||
- if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
|
||||
+ if ( stat( fullName.c_str(), &linkInfo ) == 0 )
|
||||
{
|
||||
if ( S_ISDIR( linkInfo.st_mode ) )
|
||||
{
|
||||
diff --git a/src/NCFileSelection.h b/libyui-ncurses/src/NCFileSelection.h
|
||||
index 0569215d..5c459d62 100644
|
||||
--- a/src/NCFileSelection.h
|
||||
+++ b/src/NCFileSelection.h
|
||||
@@ -44,10 +44,10 @@
|
||||
struct NCFileInfo
|
||||
{
|
||||
/**
|
||||
- * Constructor from a stat buffer (i.e. based on an lstat64() call).
|
||||
+ * Constructor from a stat buffer (i.e. based on an lstat() call).
|
||||
**/
|
||||
NCFileInfo( std::string fileName,
|
||||
- struct stat64 * statInfo,
|
||||
+ struct stat * statInfo,
|
||||
bool link = false );
|
||||
|
||||
NCFileInfo();
|
||||
@@ -65,7 +65,7 @@ struct NCFileInfo
|
||||
dev_t _device; // device this object resides on
|
||||
mode_t _mode; // file permissions + object type
|
||||
nlink_t _links; // number of links
|
||||
- off64_t _size; // size in bytes
|
||||
+ off_t _size; // size in bytes
|
||||
time_t _mtime; // modification time
|
||||
|
||||
bool isDir() { return (( S_ISDIR( _mode ) ) ? true : false ); }
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
SUMMARY = "Character Based User Interface for libyui"
|
||||
LICENSE = "LGPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
|
||||
file://0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
|
||||
|
||||
SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
|
||||
|
||||
S = "${WORKDIR}/git/libyui-ncurses"
|
||||
|
||||
inherit cmake gettext pkgconfig
|
||||
|
||||
DEPENDS += "boost libyui ncurses"
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
|
||||
EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
|
||||
|
||||
CXXFLAGS += "-DNCURSES_WIDECHAR"
|
||||
|
||||
do_configure:prepend () {
|
||||
cd ${S}
|
||||
if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then
|
||||
mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
|
||||
cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
|
||||
fi
|
||||
cd -
|
||||
sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt
|
||||
}
|
||||
|
||||
do_install:append () {
|
||||
if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then
|
||||
mv ${D}/usr/lib64 ${D}/usr/lib
|
||||
fi
|
||||
}
|
||||
|
||||
do_install:append:class-nativesdk () {
|
||||
mkdir -p ${D}/${base_prefix}
|
||||
mv ${D}/usr ${D}/${base_prefix}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/*"
|
||||
|
||||
FILES:${PN}-dev += "${libdir}/*"
|
||||
@@ -0,0 +1,593 @@
|
||||
From 18562671982ad97549bccb444fdbb5905b6e9335 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 24 Apr 2018 15:06:14 -0700
|
||||
Subject: [PATCH] Fix build with clang
|
||||
|
||||
Fix warnings found with clang
|
||||
|
||||
error: class 'YButtonBoxPrivate' was previously declared as a struct [-Werror,-Wmismatched-tags]
|
||||
| friend class YButtonBoxPrivate;
|
||||
|
||||
YTimezoneSelector.cc:35:9: error: private field 'dummy' is not used [-Werror,-Wunused-private-field]
|
||||
bool dummy;
|
||||
^
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123]
|
||||
|
||||
src/YAlignment.h | 2 +-
|
||||
src/YBarGraph.h | 2 +-
|
||||
src/YBusyIndicator.h | 2 +-
|
||||
src/YButtonBox.h | 4 ++--
|
||||
src/YCheckBox.h | 2 +-
|
||||
src/YCheckBoxFrame.h | 2 +-
|
||||
src/YComboBox.h | 2 +-
|
||||
src/YCommandLine.h | 2 +-
|
||||
src/YContextMenu.h | 2 +-
|
||||
src/YDateField.h | 2 +-
|
||||
src/YDialog.h | 2 +-
|
||||
src/YDownloadProgress.h | 2 +-
|
||||
src/YDumbTab.h | 2 +-
|
||||
src/YEmpty.h | 2 +-
|
||||
src/YEventFilter.h | 2 +-
|
||||
src/YFrame.h | 2 +-
|
||||
src/YGraph.h | 2 +-
|
||||
src/YImage.h | 2 +-
|
||||
src/YInputField.h | 2 +-
|
||||
src/YIntField.h | 2 +-
|
||||
src/YLabel.h | 2 +-
|
||||
src/YLayoutBox.h | 2 +-
|
||||
src/YLogView.h | 2 +-
|
||||
src/YMenuButton.h | 2 +-
|
||||
src/YMultiLineEdit.h | 2 +-
|
||||
src/YMultiProgressMeter.h | 2 +-
|
||||
src/YMultiSelectionBox.h | 2 +-
|
||||
src/YPartitionSplitter.h | 2 +-
|
||||
src/YProgressBar.h | 2 +-
|
||||
src/YPushButton.h | 2 +-
|
||||
src/YRadioButton.h | 2 +-
|
||||
src/YRadioButtonGroup.h | 2 +-
|
||||
src/YRichText.h | 2 +-
|
||||
src/YSelectionBox.h | 2 +-
|
||||
src/YSelectionWidget.h | 2 +-
|
||||
src/YSimpleInputField.h | 2 +-
|
||||
src/YSlider.h | 2 +-
|
||||
src/YSpacing.h | 2 +-
|
||||
src/YSquash.h | 2 +-
|
||||
src/YTable.h | 2 +-
|
||||
src/YTableHeader.h | 2 +-
|
||||
src/YTimeField.h | 2 +-
|
||||
src/YTimezoneSelector.cc | 2 +-
|
||||
src/YTree.h | 2 +-
|
||||
src/YUILog.h | 2 +-
|
||||
src/YWidget.h | 2 +-
|
||||
src/YWizard.h | 2 +-
|
||||
47 files changed, 48 insertions(+), 48 deletions(-)
|
||||
|
||||
--- a/src/YAlignment.h
|
||||
+++ b/src/YAlignment.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YSingleChildContainerWidget.h"
|
||||
|
||||
|
||||
-class YAlignmentPrivate;
|
||||
+struct YAlignmentPrivate;
|
||||
|
||||
/**
|
||||
* Implementation of all the alignment widgets:
|
||||
--- a/src/YBarGraph.h
|
||||
+++ b/src/YBarGraph.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YColor.h"
|
||||
|
||||
|
||||
-class YBarGraphPrivate;
|
||||
+struct YBarGraphPrivate;
|
||||
class YBarGraphSegment;
|
||||
|
||||
/**
|
||||
--- a/src/YBusyIndicator.h
|
||||
+++ b/src/YBusyIndicator.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YBusyIndicatorPrivate;
|
||||
+struct YBusyIndicatorPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YButtonBox.h
|
||||
+++ b/src/YButtonBox.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "YWidget.h"
|
||||
#include "YPushButton.h"
|
||||
|
||||
-class YButtonBoxPrivate;
|
||||
+struct YButtonBoxPrivate;
|
||||
class YPushButton;
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ struct YButtonBoxMargins
|
||||
**/
|
||||
class YButtonBox : public YWidget
|
||||
{
|
||||
- friend class YButtonBoxPrivate;
|
||||
+ friend struct YButtonBoxPrivate;
|
||||
|
||||
protected:
|
||||
/**
|
||||
--- a/src/YCheckBox.h
|
||||
+++ b/src/YCheckBox.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "YWidget.h"
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YCheckBoxPrivate;
|
||||
+struct YCheckBoxPrivate;
|
||||
|
||||
enum YCheckBoxState
|
||||
{
|
||||
--- a/src/YCheckBoxFrame.h
|
||||
+++ b/src/YCheckBoxFrame.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YSingleChildContainerWidget.h"
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YCheckBoxFramePrivate;
|
||||
+struct YCheckBoxFramePrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YComboBox.h
|
||||
+++ b/src/YComboBox.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSelectionWidget.h"
|
||||
|
||||
-class YComboBoxPrivate;
|
||||
+struct YComboBoxPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YCommandLine.h
|
||||
+++ b/src/YCommandLine.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <string>
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YCommandLinePrivate;
|
||||
+struct YCommandLinePrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YContextMenu.h
|
||||
+++ b/src/YContextMenu.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YMenuItem.h"
|
||||
|
||||
class YMenuItem;
|
||||
-class YContextMenuPrivate;
|
||||
+struct YContextMenuPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YDateField.h
|
||||
+++ b/src/YDateField.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSimpleInputField.h"
|
||||
|
||||
-class YDateFieldPrivate;
|
||||
+struct YDateFieldPrivate;
|
||||
|
||||
/**
|
||||
* Input field for entering a date.
|
||||
--- a/src/YDialog.h
|
||||
+++ b/src/YDialog.h
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
class YShortcutManager;
|
||||
class YPushButton;
|
||||
-class YDialogPrivate;
|
||||
+struct YDialogPrivate;
|
||||
class YEvent;
|
||||
class YEventFilter;
|
||||
|
||||
--- a/src/YDownloadProgress.h
|
||||
+++ b/src/YDownloadProgress.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
|
||||
|
||||
-class YDownloadProgressPrivate;
|
||||
+struct YDownloadProgressPrivate;
|
||||
|
||||
/**
|
||||
* DownloadProgress: A progress bar that monitors downloading a file by
|
||||
--- a/src/YDumbTab.h
|
||||
+++ b/src/YDumbTab.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSelectionWidget.h"
|
||||
|
||||
-class YDumbTabPrivate;
|
||||
+struct YDumbTabPrivate;
|
||||
|
||||
/**
|
||||
* DumbTab: A very simple tab widget that can display and switch between a
|
||||
--- a/src/YEmpty.h
|
||||
+++ b/src/YEmpty.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "ImplPtr.h"
|
||||
|
||||
|
||||
-class YEmptyPrivate;
|
||||
+struct YEmptyPrivate;
|
||||
|
||||
/**
|
||||
* A widget with zero size, useful as a placeholder.
|
||||
--- a/src/YEventFilter.h
|
||||
+++ b/src/YEventFilter.h
|
||||
@@ -32,7 +32,7 @@
|
||||
class YEvent;
|
||||
class YDialog;
|
||||
|
||||
-class YEventFilterPrivate;
|
||||
+struct YEventFilterPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YFrame.h
|
||||
+++ b/src/YFrame.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YSingleChildContainerWidget.h"
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YFramePrivate;
|
||||
+struct YFramePrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YGraph.h
|
||||
+++ b/src/YGraph.h
|
||||
@@ -37,7 +37,7 @@
|
||||
* For that reason a lot of functions simply take a void* instead of graph_t*.
|
||||
*/
|
||||
|
||||
-class YGraphPrivate;
|
||||
+struct YGraphPrivate;
|
||||
|
||||
/**
|
||||
* A graph with nodes and edges, rendered with Graphviz.
|
||||
--- a/src/YImage.h
|
||||
+++ b/src/YImage.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <string>
|
||||
|
||||
|
||||
-class YImagePrivate;
|
||||
+struct YImagePrivate;
|
||||
|
||||
/**
|
||||
* A picture, possibly animated, loaded from a file.
|
||||
--- a/src/YInputField.h
|
||||
+++ b/src/YInputField.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <string>
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YInputFieldPrivate;
|
||||
+struct YInputFieldPrivate;
|
||||
|
||||
|
||||
|
||||
--- a/src/YIntField.h
|
||||
+++ b/src/YIntField.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YIntFieldPrivate;
|
||||
+struct YIntFieldPrivate;
|
||||
|
||||
|
||||
|
||||
--- a/src/YLabel.h
|
||||
+++ b/src/YLabel.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "ImplPtr.h"
|
||||
|
||||
|
||||
-class YLabelPrivate;
|
||||
+struct YLabelPrivate;
|
||||
|
||||
/**
|
||||
* Implementation of the Label, Heading and OutputField widgets
|
||||
--- a/src/YLayoutBox.h
|
||||
+++ b/src/YLayoutBox.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YWidget.h"
|
||||
|
||||
|
||||
-class YLayoutBoxPrivate;
|
||||
+struct YLayoutBoxPrivate;
|
||||
|
||||
/**
|
||||
* A vertical or horizontal stacking of widgets, implementing HBox and VBox.
|
||||
--- a/src/YLogView.h
|
||||
+++ b/src/YLogView.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YLogViewPrivate;
|
||||
+struct YLogViewPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YMenuButton.h
|
||||
+++ b/src/YMenuButton.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YMenuWidget.h"
|
||||
#include "YMenuItem.h"
|
||||
|
||||
-class YMenuButtonPrivate;
|
||||
+struct YMenuButtonPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YMultiLineEdit.h
|
||||
+++ b/src/YMultiLineEdit.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YMultiLineEditPrivate;
|
||||
+struct YMultiLineEditPrivate;
|
||||
|
||||
/**
|
||||
* A multi-line plain-text area
|
||||
--- a/src/YMultiProgressMeter.h
|
||||
+++ b/src/YMultiProgressMeter.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
#include <vector>
|
||||
|
||||
-class YMultiProgressMeterPrivate;
|
||||
+struct YMultiProgressMeterPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YMultiSelectionBox.h
|
||||
+++ b/src/YMultiSelectionBox.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSelectionWidget.h"
|
||||
|
||||
-class YMultiSelectionBoxPrivate;
|
||||
+struct YMultiSelectionBoxPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YPartitionSplitter.h
|
||||
+++ b/src/YPartitionSplitter.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
|
||||
|
||||
-class YPartitionSplitterPrivate;
|
||||
+struct YPartitionSplitterPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YProgressBar.h
|
||||
+++ b/src/YProgressBar.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YProgressBarPrivate;
|
||||
+struct YProgressBarPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YPushButton.h
|
||||
+++ b/src/YPushButton.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YPushButtonPrivate;
|
||||
+struct YPushButtonPrivate;
|
||||
|
||||
|
||||
|
||||
--- a/src/YRadioButton.h
|
||||
+++ b/src/YRadioButton.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
|
||||
class YRadioButtonGroup;
|
||||
-class YRadioButtonPrivate;
|
||||
+struct YRadioButtonPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YRadioButtonGroup.h
|
||||
+++ b/src/YRadioButtonGroup.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YSingleChildContainerWidget.h"
|
||||
|
||||
class YRadioButton;
|
||||
-class YRadioButtonGroupPrivate;
|
||||
+struct YRadioButtonGroupPrivate;
|
||||
|
||||
typedef std::list<YRadioButton *> YRadioButtonList;
|
||||
typedef YRadioButtonList::iterator YRadioButtonListIterator;
|
||||
--- a/src/YRichText.h
|
||||
+++ b/src/YRichText.h
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "ImplPtr.h"
|
||||
|
||||
|
||||
-class YRichTextPrivate;
|
||||
+struct YRichTextPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YSelectionBox.h
|
||||
+++ b/src/YSelectionBox.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSelectionWidget.h"
|
||||
|
||||
-class YSelectionBoxPrivate;
|
||||
+struct YSelectionBoxPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YSelectionWidget.h
|
||||
+++ b/src/YSelectionWidget.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "YItem.h"
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YSelectionWidgetPrivate;
|
||||
+struct YSelectionWidgetPrivate;
|
||||
|
||||
/**
|
||||
* Base class for various kinds of multi-value widgets.
|
||||
--- a/src/YSimpleInputField.h
|
||||
+++ b/src/YSimpleInputField.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YWidget.h"
|
||||
|
||||
-class YSimpleInputFieldPrivate;
|
||||
+struct YSimpleInputFieldPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YSlider.h
|
||||
+++ b/src/YSlider.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YIntField.h"
|
||||
|
||||
-class YSliderPrivate;
|
||||
+struct YSliderPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YSpacing.h
|
||||
+++ b/src/YSpacing.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
#include "ImplPtr.h"
|
||||
|
||||
-class YSpacingPrivate;
|
||||
+struct YSpacingPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YSquash.h
|
||||
+++ b/src/YSquash.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "ImplPtr.h"
|
||||
|
||||
|
||||
-class YSquashPrivate;
|
||||
+struct YSquashPrivate;
|
||||
|
||||
/**
|
||||
* HSquash, VSquash HVSquash: reduce child to its preferred size.
|
||||
--- a/src/YTable.h
|
||||
+++ b/src/YTable.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "YTableItem.h"
|
||||
#include "YTableHeader.h"
|
||||
|
||||
-class YTablePrivate;
|
||||
+struct YTablePrivate;
|
||||
|
||||
|
||||
|
||||
--- a/src/YTableHeader.h
|
||||
+++ b/src/YTableHeader.h
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
|
||||
-class YTableHeaderPrivate;
|
||||
+struct YTableHeaderPrivate;
|
||||
|
||||
/**
|
||||
* Helper class for YTable for table column properties:
|
||||
--- a/src/YTimeField.h
|
||||
+++ b/src/YTimeField.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "YSimpleInputField.h"
|
||||
|
||||
-class YTimeFieldPrivate;
|
||||
+struct YTimeFieldPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YTimezoneSelector.cc
|
||||
+++ b/src/YTimezoneSelector.cc
|
||||
@@ -34,7 +34,7 @@ using std::string;
|
||||
|
||||
class YTimezoneSelectorPrivate
|
||||
{
|
||||
- bool dummy;
|
||||
+// bool dummy;
|
||||
};
|
||||
|
||||
|
||||
--- a/src/YTree.h
|
||||
+++ b/src/YTree.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YSelectionWidget.h"
|
||||
|
||||
class YTreeItem;
|
||||
-class YTreePrivate;
|
||||
+struct YTreePrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YUILog.h
|
||||
+++ b/src/YUILog.h
|
||||
@@ -66,7 +66,7 @@ using std::endl;
|
||||
|
||||
|
||||
|
||||
-class YUILogPrivate;
|
||||
+struct YUILogPrivate;
|
||||
|
||||
enum YUILogLevel_t
|
||||
{
|
||||
--- a/src/YWidget.h
|
||||
+++ b/src/YWidget.h
|
||||
@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget> YWidge
|
||||
typedef YSingleChildManager<YWidget> YSingleWidgetChildManager;
|
||||
typedef YChildrenRejector<YWidget> YWidgetChildrenRejector;
|
||||
|
||||
-class YWidgetPrivate;
|
||||
+struct YWidgetPrivate;
|
||||
|
||||
|
||||
/**
|
||||
--- a/src/YWizard.h
|
||||
+++ b/src/YWizard.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "YWidget.h"
|
||||
|
||||
class YMacroRecorder;
|
||||
-class YWizardPrivate;
|
||||
+struct YWizardPrivate;
|
||||
class YPushButton;
|
||||
class YReplacePoint;
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
From d24c2516ae25d0ee180c1020e52114ea32230585 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@siemens.com>
|
||||
Date: Mon, 29 Oct 2018 18:03:43 +0100
|
||||
Subject: [PATCH] Use relative install paths for CMake
|
||||
|
||||
Files are installed via a special _PREFIX variant of the INSTALL_???_DIR
|
||||
variable which is an absolute path.
|
||||
|
||||
This not only is redundant if CMAKE_INTALL_PREFIX is set but it even causes
|
||||
the resulting Config.cmake to be non relocatable. This means it contains absolute
|
||||
paths to the build host. This is a problem for cross compilation in Yocto.
|
||||
|
||||
This change gets rid of the absolute path and removes the no longer needed
|
||||
_PREFIX variants.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/140]
|
||||
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
|
||||
---
|
||||
legacy-buildtools/LibyuiCommon.cmake | 35 ++++++++++++++---------------------
|
||||
1 file changed, 14 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/legacy-buildtools/LibyuiCommon.cmake b/legacy-buildtools/LibyuiCommon.cmake
|
||||
index e6fbefd..5e2fc0d 100644
|
||||
--- a/legacy-buildtools/LibyuiCommon.cmake
|
||||
+++ b/legacy-buildtools/LibyuiCommon.cmake
|
||||
@@ -258,13 +258,6 @@ MACRO( SET_ENVIRONMENT ) # setup the environment vars
|
||||
|
||||
SET( INSTALL_DOC_DIR "${DOC_DIR}" )
|
||||
|
||||
- FOREACH( p "DOC" LIB INCLUDE CMAKE PKGCONFIG BUILDTOOLS )
|
||||
- SET( var "INSTALL_${p}_DIR" )
|
||||
- IF( NOT IS_ABSOLUTE "${${var}}" )
|
||||
- SET( ${var}_PREFIX "${YPREFIX}/${${var}}" )
|
||||
- ENDIF( NOT IS_ABSOLUTE "${${var}}" )
|
||||
- ENDFOREACH()
|
||||
-
|
||||
ENDMACRO( SET_ENVIRONMENT )
|
||||
|
||||
MACRO( SET_SONAME )
|
||||
@@ -359,7 +352,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc
|
||||
IF( INSTALL_DOCS OR DOCS_ONLY )
|
||||
INSTALL(
|
||||
FILES "${CMAKE_BINARY_DIR}/doc/latex/refman.pdf"
|
||||
- DESTINATION "${INSTALL_DOC_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_DOC_DIR}"
|
||||
)
|
||||
ENDIF( INSTALL_DOCS OR DOCS_ONLY )
|
||||
|
||||
@@ -379,7 +372,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc
|
||||
FOREACH( p css gif html jpg js png tag )
|
||||
INSTALL(
|
||||
DIRECTORY "${CMAKE_BINARY_DIR}/doc/html"
|
||||
- DESTINATION "${INSTALL_DOC_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_DOC_DIR}"
|
||||
FILES_MATCHING PATTERN "*.${p}"
|
||||
)
|
||||
ENDFOREACH()
|
||||
@@ -638,32 +631,32 @@ MACRO( SET_INSTALL_TARGET )
|
||||
|
||||
INSTALL(
|
||||
EXPORT ${PROJECTNAME_UC}LibraryDepends
|
||||
- DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_CMAKE_DIR}"
|
||||
COMPONENT dev
|
||||
)
|
||||
|
||||
FOREACH( p Config.cmake ConfigVersion.cmake )
|
||||
INSTALL(
|
||||
FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME_UC}${p}"
|
||||
- DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_CMAKE_DIR}"
|
||||
)
|
||||
ENDFOREACH( p Config.cmake ConfigVersion.cmake )
|
||||
|
||||
INSTALL(
|
||||
FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME}.pc"
|
||||
- DESTINATION "${INSTALL_PKGCONFIG_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_PKGCONFIG_DIR}"
|
||||
)
|
||||
|
||||
IF( NOT PLUGINNAME AND NOT EXTENSIONNAME )
|
||||
INSTALL(
|
||||
DIRECTORY "${BUILDTOOLS_DIR}"
|
||||
- DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_BUILDTOOLS_DIR}"
|
||||
)
|
||||
ENDIF( NOT PLUGINNAME AND NOT EXTENSIONNAME )
|
||||
|
||||
INSTALL(
|
||||
FILES ${BUILDTOOLS_LIST}
|
||||
- DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}"
|
||||
+ DESTINATION "${INSTALL_BUILDTOOLS_DIR}"
|
||||
)
|
||||
|
||||
ENDMACRO( SET_INSTALL_TARGET )
|
||||
@@ -724,9 +717,9 @@ MACRO( PROCESS_SOURCES )
|
||||
INSTALL(
|
||||
TARGETS ${TARGETLIB}
|
||||
EXPORT ${PROJECTNAME_UC}LibraryDepends
|
||||
- LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}"
|
||||
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}"
|
||||
- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}"
|
||||
+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
|
||||
+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
|
||||
+ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
|
||||
COMPONENT dev
|
||||
)
|
||||
|
||||
@@ -746,9 +739,9 @@ MACRO( PROCESS_SOURCES )
|
||||
INSTALL(
|
||||
TARGETS ${TARGETLIB}_static
|
||||
EXPORT ${PROJECTNAME_UC}LibraryDepends
|
||||
- LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}"
|
||||
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}"
|
||||
- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}"
|
||||
+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
|
||||
+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
|
||||
+ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
|
||||
COMPONENT dev
|
||||
)
|
||||
|
||||
@@ -776,7 +769,7 @@ MACRO( PROCESS_EXAMPLES )
|
||||
|
||||
INSTALL(
|
||||
FILES ${EXAMPLES_LIST}
|
||||
- DESTINATION "${INSTALL_DOC_DIR_PREFIX}/examples"
|
||||
+ DESTINATION "${INSTALL_DOC_DIR}/examples"
|
||||
)
|
||||
|
||||
ENDMACRO( PROCESS_EXAMPLES )
|
||||
@@ -0,0 +1,36 @@
|
||||
SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends."
|
||||
LICENSE = "LGPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://../COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
|
||||
file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
|
||||
file://0001-Fix-build-with-clang.patch \
|
||||
file://0001-Use-relative-install-paths-for-CMake.patch \
|
||||
"
|
||||
|
||||
SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
|
||||
|
||||
S = "${WORKDIR}/git/libyui"
|
||||
|
||||
inherit cmake gettext pkgconfig
|
||||
|
||||
DEPENDS += "boost"
|
||||
|
||||
EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
do_install:append () {
|
||||
if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then
|
||||
mv ${D}/usr/lib64 ${D}/usr/lib
|
||||
fi
|
||||
}
|
||||
|
||||
do_install:append:class-nativesdk () {
|
||||
mkdir -p ${D}/${base_prefix}
|
||||
mv ${D}/usr ${D}/${base_prefix}
|
||||
}
|
||||
|
||||
FILES:${PN}-dev = "${libdir}/* ${includedir}/yui*"
|
||||
Reference in New Issue
Block a user